phyusin 2a4a796ae5 conflict data

2018-07-04 18:47:26 +06:30

..

api

update reduce loading

2018-07-04 14:24:31 +06:30

crm

…

home

…

install

…

inventory

…

kaminari

…

layouts

…

oqs

…

origami

UI for credit payment

2018-07-04 18:46:13 +06:30

print_settings

update printsetting form

2018-07-02 11:32:10 +06:30

reports

add payment type filter for order reservation

2018-07-03 10:34:24 +06:30

settings

…

sym_control

…

transactions

change some report format

2018-06-28 11:45:07 +06:30