Yan 124528c138 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant

2017-07-26 18:40:11 +06:30

..

api

update conflict file

2017-07-02 14:37:21 +06:30

concerns

…

crm

crm updated

2017-07-26 18:39:46 +06:30

oqs

membership update

2017-07-24 19:24:43 +06:30

origami

update rounding adj for osaka

2017-07-26 16:35:34 +06:30

reports

update comertial tax and service in sale model

2017-07-24 19:25:31 +06:30

settings

update control member for osaka

2017-07-12 19:43:56 +06:30

transactions

update audit sales

2017-07-03 10:28:13 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

finished report for all

2017-07-17 11:22:24 +06:30

base_waiter_controller.rb

…

home_controller.rb

update login To show dashboard screen with available features based on user type

2017-07-24 17:42:34 +06:30

install_controller.rb

…

print_settings_controller.rb

…