Myat Zin Wai Maw 98bbf419fe fix conflict

2019-06-12 11:30:53 +06:30

..

bksaleitem_controller.rb

…

card_sale_tran_controller.rb

…

card_settle_tran_controller.rb

…

commission_controller.rb

…

credit_payment_controller.rb

…

dailysale_controller.rb

wt updated

2019-05-29 18:37:58 +06:30

induty_controller.rb

…

order_reservation_controller.rb

…

payment_method_controller.rb

update shift query for payment method

2018-11-20 10:02:39 +06:30

product_sale_controller.rb

…

receipt_no_controller.rb

…

receipt_no_detail_controller.rb

…

saleitem_controller.rb

fix conflict

2019-06-12 11:30:53 +06:30

shiftsale_controller.rb

fixed shift sales print

2019-06-04 18:55:42 +06:30

stock_check_controller.rb

…

void_sale_controller.rb

…

waste_and_spoilage_controller.rb

…