schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
This commit is contained in:
Saif Ur Rehman
2019-01-10 04:23:40 +05:00
parent edd0e2476f eb7277d2d4
commit 8d61794540
67 changed files with 2280 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/js/controllers/buying.js
View File

@@ -112,6 +112,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
supplier_address: function() {
erpnext.utils.get_address_display(this.frm);
erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address");
},
buying_price_list: function() {