Aung Myo e9e184894d update fixed conflict

2017-06-28 16:44:31 +06:30

..

card_payments_controller.rb

…

cash_mgmt_controller.rb

shift close and payment journal

2017-06-28 10:34:42 +06:30

credit_payments_controller.rb

credit note payment

2017-06-26 17:49:55 +06:30

customers_controller.rb

Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 17:02:25 +06:30

discounts_controller.rb

add remove item and remove all in discount

2017-06-28 10:59:03 +06:30

home_controller_bk.rb

…

home_controller.rb

overall void

2017-06-26 18:00:48 +06:30

jcb_controller.rb

…

master_controller.rb

…

moveroom_controller.rb

…

movetable_controller.rb

…

mpu_controller.rb

…

orders_controller.rb

get update

2017-06-27 10:28:47 +06:30

others_payments_controller.rb

…

payments_controller.rb

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 18:46:16 +06:30

paypar_payments_controller.rb

…

redeem_payments_controller.rb

…

request_bills_controller.rb

fix for undefied method type in item pdf

2017-06-28 15:40:54 +06:30

room_invoices_controller.rb

Multiple Invoices Phase 1

2017-06-26 11:10:49 +06:30

rooms_controller.rb

…

sale_edit_controller.rb

item void

2017-06-26 17:07:17 +06:30

sales_controller.rb

…

shifts_controller.rb

shift close and payment journal

2017-06-28 10:34:42 +06:30

table_invoices_controller.rb

multiple invoice void

2017-06-27 11:35:36 +06:30

visa_controller.rb

…

void_controller.rb

multiple invoice void

2017-06-27 11:35:36 +06:30