Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Billing address in for Purchase documents

Browse Source
This commit is contained in:
Deepesh Garg 2020-06-13 22:40:23 +05:30
parent d5b97d6996
commit 6760077674
4 changed files with 1215 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

616
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

File diff suppressed because it is too large Load Diff

508
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

File diff suppressed because it is too large Load Diff

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

@ -73,6 +73,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
me.frm.set_query('contact_person', erpnext.queries.contact_query);
me.frm.set_query('supplier_address', erpnext.queries.address_query);
me.frm.set_query('billing_address', erpnext.queries.company_address_query);
if(this.frm.fields_dict.supplier) {
this.frm.set_query("supplier", function() {
return{ query: "erpnext.controllers.queries.supplier_query" }});
@ -283,6 +285,11 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
"shipping_address_display", true);
},
billing_address: function() {
erpnext.utils.get_address_display(this.frm, "billing_address",
"billing_address_display", true);
},
tc_name: function() {
this.get_terms();
},

456
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

File diff suppressed because it is too large Load Diff