Nweni 6fbf30c950 fixed conflict

2019-11-25 09:26:21 +06:30

..

api

customer create

2019-11-19 09:16:55 +06:30

crm

shop code

2019-11-22 18:24:02 +06:30

home

shops

2019-11-18 12:22:31 +06:30

induties/assign_in_duties

calculate induties in bill

2019-06-19 17:12:44 +06:30

install

…

inventory

shop code

2019-11-22 18:24:02 +06:30

kaminari

…

layouts

add staff meal

2019-11-18 09:57:55 +06:30

oqs

shop code

2019-11-22 18:24:02 +06:30

origami

shop code

2019-11-22 18:24:02 +06:30

print_settings

sale_items pdf

2019-05-22 13:51:55 +06:30

reports

Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

2019-11-18 10:23:11 +06:30

settings

menu form is_ordering and is_active to data type boolean

2019-10-29 14:15:43 +06:30

sym_control

…

transactions

fix date in sale tran

2019-10-03 09:48:01 +06:30