Aung Myo ac47501e01 update conflic for pull master

2018-02-23 14:58:35 +06:30

..

api

change person item code process

2018-01-23 15:02:50 +06:30

crm

…

home

conflic data

2018-02-09 10:17:56 +06:30

install

…

inventory

…

kaminari

…

layouts

check waiter role

2018-02-23 10:53:12 +06:30

oqs

Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

2018-02-22 18:52:55 +06:30

origami

update conflic for pull master

2018-02-23 14:58:35 +06:30

print_settings

add printer lists of system

2018-01-16 11:39:37 +06:30

reports

change sale item 'foc'

2018-01-25 18:06:24 +06:30

settings

add interger checked for promotions

2018-01-25 10:37:05 +06:30

sym_control

…

transactions

…