Nweni 9b798dc699 fixed conflict

2019-11-08 16:08:45 +06:30

..

addorders_controller.rb

CBKI

2019-10-30 16:52:16 +06:30

alipay_controller.rb

…

bank_integration_controller.rb

…

card_payments_controller.rb

…

cash_ins_controller.rb

…

cash_mgmt_controller.rb

…

cash_outs_controller.rb

…

check_in_process_controller.rb

…

credit_payments_controller.rb

…

credit_sales_controller.rb

…

customers_controller.rb

…

dashboard_controller.rb

…

dinga_controller.rb

…

discounts_controller.rb

rounding decimal to print_settings precision

2019-11-06 17:34:42 +06:30

food_court_controller.rb

prevent order append to previous sale

2019-10-07 10:43:43 +06:30

gift_voucher_controller.rb

…

home_controller_bk.rb

…

home_controller.rb

precision

2019-09-05 18:12:17 +06:30

in_duties_controller.rb

…

jcb_controller.rb

…

junction_pay_controller.rb

…

master_controller.rb

…

moveroom_controller.rb

…

movetable_controller.rb

…

mpu_controller.rb

…

order_reservation_controller.rb

…

orders_controller.rb

…

other_charges_controller.rb

…

others_payments_controller.rb

…

paymal_controller.rb

…

payments_controller.rb

fixed conflict

2019-11-08 16:08:45 +06:30

paypar_payments_controller.rb

…

pending_order_controller.rb

CBKI

2019-10-30 16:52:16 +06:30

product_commissions_controller.rb

…

quick_service_controller.rb

prevent order append to previous sale

2019-10-07 10:43:43 +06:30

redeem_payments_controller.rb

…

request_bills_controller.rb

prevent order append to previous sale

2019-10-07 10:43:43 +06:30

reservation_controller.rb

…

room_invoices_controller.rb

…

rooms_controller.rb

…

sale_edit_controller.rb

rounding decimal to print_settings precision

2019-11-06 17:34:42 +06:30

sales_controller.rb

fixed conflit

2019-09-13 21:15:01 +06:30

second_display_controller.rb

…

shifts_controller.rb

…

split_bill_controller.rb

fixed split bill

2019-10-04 18:20:14 +06:30

surveys_controller.rb

…

table_invoices_controller.rb

…

unionpay_controller.rb

…

visa_controller.rb

…

void_controller.rb

add foc amount in saleitem report

2019-09-11 17:12:15 +06:30

voucher_controller.rb

…

waste_spoile_controller.rb

…