Nweni 3bc3419243 fixed conflict

2017-06-12 18:52:12 +06:30

..

api

Update

2017-06-12 13:26:09 +06:30

concerns

…

crm

fixed conflict

2017-06-12 18:52:12 +06:30

oqs

to do req_bill_format and status changed after pay

2017-06-12 00:45:26 +06:30

origami

Edit Customer

2017-06-12 18:50:06 +06:30

reports

ReceiptList Report Rough

2017-06-12 18:26:00 +06:30

settings

finished order and sales in setting

2017-06-12 00:45:59 +06:30

transactions

…

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

add base report controller

2017-06-09 13:35:41 +06:30

base_waiter_controller.rb

…

home_controller.rb

…

install_controller.rb

…

print_settings_controller.rb

…