Aung Myo cfa819f985 fixed conflic

2017-10-31 12:13:19 +06:30

..

addorders

merge with origin

2017-10-27 17:06:07 +06:30

cash_ins

update sale audit

2017-10-31 12:08:27 +06:30

cash_mgmt

UI change

2017-10-23 11:38:10 +06:30

cash_outs

merge with phyu sin

2017-10-27 18:40:58 +06:30

credit_payments

update orgamidesign etcc..

2017-10-23 18:11:43 +06:30

customers

merge with origin

2017-10-27 17:06:07 +06:30

discounts

update sale audit

2017-10-31 12:08:27 +06:30

home

fixed conflic

2017-10-31 12:13:19 +06:30

in_duties

merge with origin

2017-10-27 17:06:07 +06:30

jcb

merge with origin

2017-10-27 17:06:07 +06:30

master

update orgamidesign etcc..

2017-10-23 18:11:43 +06:30

moveroom

merge with origin

2017-10-27 17:06:07 +06:30

movetable

update setting admin pages

2017-10-24 18:16:03 +06:30

mpu

merge with origin

2017-10-27 17:06:07 +06:30

orders

update setting admin pages

2017-10-24 18:16:03 +06:30

other_charges

update sale audit

2017-10-31 12:08:27 +06:30

others_payments

merge with origin

2017-10-27 17:06:07 +06:30

payments

update orgamidesign etcc..

2017-10-23 18:11:43 +06:30

paypar_payments

UI change

2017-10-23 11:38:10 +06:30

product_commissions

merge with origin

2017-10-27 17:06:07 +06:30

redeem_payments

UI change

2017-10-23 11:38:10 +06:30

request_bills

UI change

2017-10-23 11:38:10 +06:30

room_invoices

UI change

2017-10-23 11:38:10 +06:30

rooms

merge with origin

2017-10-27 17:06:07 +06:30

sale_edit

UI change

2017-10-23 11:38:10 +06:30

sales

update sale audit

2017-10-31 12:08:27 +06:30

shifts

merge with phyu sin

2017-10-27 18:40:58 +06:30

table_invoices

UI change

2017-10-23 11:38:10 +06:30

visa

update orgamidesign etcc..

2017-10-23 18:11:43 +06:30

voucher

merge with origin

2017-10-27 17:06:07 +06:30