phyusin c4cefb05ae conflict data

2018-05-28 10:46:04 +06:30

..

api

conflict data

2018-05-28 10:46:04 +06:30

concerns

Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန

2018-05-14 15:31:00 +06:30

crm

Pull from master

2018-05-22 13:26:23 +06:30

inventory

…

oqs

conflict data

2018-05-28 10:46:04 +06:30

origami

Pull from master

2018-05-25 16:22:30 +06:30

reports

change receipt no report ui and add sale taxes for dining charges

2018-05-23 16:57:41 +06:30

settings

pull from master 23.5.2018

2018-05-23 09:36:49 +06:30

transactions

remove paginate in surveys

2018-05-23 17:55:17 +06:30

application_controller.rb

…

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 23.5.2018

2018-05-23 09:36:49 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

…