phyusin bd06e80b37 remove conflict data

2018-03-05 16:24:45 +06:30

..

addorders

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

cash_ins

…

cash_mgmt

…

cash_outs

…

credit_payments

…

customers

update no table quick srevice

2018-02-14 18:21:10 +06:30

dashboard

remove conflict data

2018-03-05 16:24:45 +06:30

discounts

check discount calculation

2018-02-28 13:55:24 +06:30

home

remove conflict data

2018-02-27 14:35:21 +06:30

in_duties

…

jcb

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

master

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

moveroom

…

movetable

…

mpu

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

orders

update quick service for split bill

2018-02-20 15:29:19 +06:30

other_charges

update no table quick srevice

2018-02-14 18:21:10 +06:30

others_payments

…

payments

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

paypar_payments

…

pending_order

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

product_commissions

…

quick_service

update fixed issues for quickservice from sqa

2018-02-28 14:20:22 +06:30

redeem_payments

…

request_bills

…

room_invoices

…

rooms

remove conflict data

2018-02-27 14:35:21 +06:30

sale_edit

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

sales

…

shifts

…

split_bill

check order item

2018-02-27 11:33:51 +06:30

surveys

check some function

2018-02-19 18:05:30 +06:30

table_invoices

add link for oqs in origami

2018-02-22 18:51:57 +06:30

unionpay

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

visa

Validate required for reference no: in other payment amount

2018-02-22 16:43:53 +06:30

voucher

…