phyusin a60f80a874 remove conflict

2018-07-09 09:44:36 +06:30

..

api/origami

…

app/controllers/origami

…

BSBMaterial

…

channels

check JunctionPay

2018-06-11 17:20:47 +06:30

crm

…

origami

…

reports

…

settings

update processing itemjs

2018-05-24 15:26:12 +06:30

transactions

…

addorder.js

update optimization

2018-07-05 18:19:16 +06:30

application_backup.js

…

application.js

add global override Chart YAxis

2018-06-07 15:17:58 +06:30

cable.js

Pull from master

2018-05-18 16:26:03 +06:30

cash_mgmt.coffee

…

Chart.js

…

Chart.min.js

…

commissioners.coffee

…

commissions.coffee

…

CRM.js

…

custom.js

change saleitem query and js for order reservation

2018-06-06 11:47:21 +06:30

dining_charges.coffee

…

fileinput.min.js

…

inventory_definitions.coffee

…

inventory.js

…

jquery-confirm.js

…

login.js

…

membership_actions.coffee

…

OQS.js

Change table view in OQS

2018-05-02 15:10:58 +06:30

order_reservation.js

check order reservataion status

2018-06-26 15:43:58 +06:30

origami_bk.js

…

origami.js

credit payment view

2018-07-05 17:03:29 +06:30

payment.js

…

popper.min.js

…

print_settings.coffee

…

report.js

…

stock_check_items.coffee

…

stock_checks.coffee

…

stock_journals.coffee

…

transactions.js

…

wow_script.js

…

wowslider.js

…