phyusin adefd8c034 remove conflict data

2018-02-27 14:35:21 +06:30

..

api/origami

…

app/controllers/origami

CB ECR Integration

2018-01-10 18:08:28 +06:30

BSBMaterial

…

origami

split bill

2018-02-01 18:12:59 +06:30

reports

product sale

2018-02-23 14:03:25 +06:30

settings

…

transactions

…

addorder.scss

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

2018-02-21 13:28:43 +06:30

application_backup.scss

…

application.scss

…

cash_mgmt.scss

…

commissioners.scss

…

commissions.scss

…

CRM.scss

menu categories is_available and Logout css

2017-12-05 17:11:49 +06:30

dining_charges.scss

…

employees.scss

…

fileinput.min.css

…

install.scss

…

inventory_definitions.scss

menu categories is_available and Logout css

2017-12-05 17:11:49 +06:30

jquery-confirm.scss

…

login.scss

…

membership_actions.scss

…

OQS.scss

menu categories is_available and Logout css

2017-12-05 17:11:49 +06:30

origami.scss

remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30

print_settings.scss

…

reset.css

Shop name in navbar,linke to shop info

2018-02-05 18:11:45 +06:30

scaffolds.scss

…

settings.scss

…

stock_check_items.scss

…

stock_checks.scss

…

stock_journals.scss

…

sx_font.css

…

theme.scss

…

transactions.scss

…

waiter.scss

…