Saif Ur Rehman 74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ...

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json

2019-01-22 16:20:40 +05:00

..

accounts.js

Get Advances and auto allocate (#14970)

2018-08-01 18:07:39 +05:30

buying.js

Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12

2019-01-22 16:20:40 +05:00

stock_controller.js

minor route fix for general ledger

2018-07-17 15:59:15 +05:30

taxes_and_totals.js

Merge branch 'staging' into develop

2018-11-15 09:26:03 +00:00

transaction.js

Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12

2019-01-18 17:33:19 +05:00