Nweni d41d957688 fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30

..

bksaleitem_controller.rb

…

card_sale_tran_controller.rb

…

card_settle_tran_controller.rb

…

commission_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

credit_payment_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

dailysale_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

hourly_saleitem_controller.bk.rb

fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30

hourly_saleitem_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

induty_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

order_reservation_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

payment_method_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

product_sale_controller.rb

…

receipt_no_controller.rb

fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30

receipt_no_detail_controller.rb

fixed conflict after merge with dev branch for report query updated

2019-11-27 14:09:16 +06:30

saleitem_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

shiftsale_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

staff_meal_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

stock_check_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

void_sale_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30

waste_and_spoilage_controller.rb

shop code filter for all reports and transactions

2019-11-26 12:06:52 +06:30