phyusin 776479a74e remove conflict data

2018-05-29 14:32:37 +06:30

..

bksaleitem_controller.rb

…

commission_controller.rb

…

credit_payment_controller.rb

…

dailysale_controller.rb

…

order_reservation_controller.rb

…

payment_method_controller.rb

add new payment for aston request

2018-05-29 14:29:38 +06:30

product_sale_controller.rb

…

receipt_no_controller.rb

update sale receipt no repoet

2018-05-29 10:39:09 +06:30

saleitem_controller.rb

…

shiftsale_controller.rb

check unclose shift in filter

2018-05-15 17:35:10 +06:30

stock_check_controller.rb

…

void_sale_controller.rb

…

waste_and_spoilage_controller.rb

…