Nweni d41d957688 fixed conflict after merge with dev

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

..

api

fixed conflict after merge with dev

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

concerns

fixed conflict after merge with dev

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

crm

fixed conflict after merge with dev

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

induties

calculate induties in bill

2019-06-19 17:12:44 +06:30

inventory

fixed conflict after merge with dev

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

oqs

fixed conflict after merge with dev

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

origami

fixed conflict after merge with dev

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

reports

fixed conflict after merge with dev

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

settings

fixed conflict after merge with dev

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

transactions

shop code filter for all reports and transactions

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

application_controller.rb

improve receipt/details reports and implement number formatting

2019-11-25 23:17:53 +06:30

base_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30

base_crm_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30

base_inventory_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30

base_oqs_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30

base_origami_controller.rb

improve receipt/details reports and implement number formatting

2019-11-25 23:17:53 +06:30

base_report_controller.rb

update number_formattable. update dashboard query.

2019-11-28 14:13:00 +06:30

base_waiter_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30

home_controller.rb

fixed conflict after merge with dev

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

install_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30

print_settings_controller.rb

shop code

2019-11-22 18:24:02 +06:30

sym_control_controller.rb

shop_detail func: update in base

2019-01-07 16:05:18 +06:30