phyusin fa421ee718 remove git conflict

2018-09-07 17:44:57 +06:30

..

api

Edit shop_code

2018-08-20 11:23:05 +06:30

crm

add dashboard settings and customer create

2018-07-13 18:00:49 +06:30

home

Pull from master

2018-08-06 17:52:03 +06:30

install

…

inventory

change some func:

2018-08-23 14:23:08 +06:30

kaminari

…

layouts

some changes for order reservation

2018-09-06 11:45:24 +06:30

oqs

update back button hide in oqs

2018-09-03 15:08:45 +06:30

origami

remove git conflict

2018-09-07 17:44:57 +06:30

print_settings

update printsetting form

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

reports

add new delivery type for turbo

2018-08-30 17:04:32 +06:30

settings

update shop note

2018-08-31 13:49:39 +06:30

sym_control

…

transactions

change query for report

2018-08-30 17:45:51 +06:30