Aung Myo f8df5147a4 fixed conflict file

2017-06-13 10:40:49 +06:30

..

api

queue and crm view updated

2017-06-09 09:29:25 +06:30

crm

update customer amount

2017-06-13 10:36:40 +06:30

home

…

install

…

kaminari

finished order and sales in setting

2017-06-12 00:45:59 +06:30

layouts

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-12 18:33:23 +06:30

oqs

…

origami

fixed conflict file

2017-06-13 10:40:49 +06:30

print_settings

…

reports

ui updating for report

2017-06-13 09:59:56 +06:30

settings

finished order and sales in setting

2017-06-12 00:45:59 +06:30

transactions/sales

…