Get party details fixes
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 9792da1..cd172f1 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -12,13 +12,14 @@
@frappe.whitelist()
def get_party_details(party=None, account=None, party_type="Customer", company=None,
- posting_date=None, price_list=None, currency=None):
+ posting_date=None, price_list=None, currency=None, doctype=None):
- return _get_party_details(party, account, party_type, company, posting_date, price_list, currency)
+ return _get_party_details(party, account, party_type,
+ company, posting_date, price_list, currency, doctype)
def _get_party_details(party=None, account=None, party_type="Customer", company=None,
- posting_date=None, price_list=None, currency=None, ignore_permissions=False):
- out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date))
+ posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False):
+ out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, doctype))
party = out[party_type.lower()]
@@ -106,8 +107,8 @@
out["selling_price_list" if party.doctype=="Customer" else "buying_price_list"] = price_list
-def set_account_and_due_date(party, account, party_type, company, posting_date):
- if not posting_date:
+def set_account_and_due_date(party, account, party_type, company, posting_date, doctype):
+ if doctype not in ["Sales Invoice", "Purchase Invoice"]:
# not an invoice
return {
party_type.lower(): party
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 40db97f..c9b1206 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -25,6 +25,7 @@
args.currency = frm.doc.currency;
args.company = frm.doc.company;
+ args.doctype = frm.doc.doctype;
frappe.call({
method: method,
args: args,
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 510b395..9597392 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -241,14 +241,14 @@
customer: function() {
return this.frm.call({
method: "erpnext.accounts.party.get_party_details",
- args: { party: this.frm.doc.customer, party_type:"Customer" }
+ args: { party: this.frm.doc.customer, party_type:"Customer", doctype: this.frm.doc.doctype }
});
},
supplier: function() {
return this.frm.call({
method: "erpnext.accounts.party.get_party_details",
- args: { party: this.frm.doc.supplier, party_type:"Supplier" }
+ args: { party: this.frm.doc.supplier, party_type:"Supplier", doctype: this.frm.doc.doctype }
});
},