phyusin a2fd489ec4 remove conflict

2018-08-20 12:08:51 +06:30

..

api

edit in check time

2018-08-14 15:22:49 +06:30

concerns

Edit in bill and request bill controller

2018-08-07 14:41:18 +06:30

crm

Pull from master

2018-08-06 17:52:03 +06:30

inventory

remove conflict

2018-08-20 12:08:51 +06:30

oqs

Pull from master

2018-08-20 11:26:07 +06:30

origami

Pull from master

2018-08-20 11:26:07 +06:30

reports

Remove common function

2018-08-07 13:50:18 +06:30

settings

update oqs employee and oqs station

2018-08-14 17:21:06 +06:30

transactions

Edit in report

2018-08-06 14:44:26 +06:30

application_controller.rb

Edit in bill and request bill controller

2018-08-07 14:41:18 +06:30

base_controller.rb

…

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

Pull from master

2018-08-06 17:52:03 +06:30

install_controller.rb

…

print_settings_controller.rb

Edit route for delete in print Settings

2018-06-20 11:09:25 +06:30

sym_control_controller.rb

…