From 4d7c4fc0f40d5ff745cf1a3f6fead56e9680f702 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 18 Jun 2014 16:40:27 +0530 Subject: [PATCH] Get party details fixes --- erpnext/accounts/party.py | 13 +++++++------ erpnext/public/js/utils/party.js | 1 + erpnext/stock/doctype/stock_entry/stock_entry.js | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 9792da1b26..cd172f1902 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -12,13 +12,14 @@ from erpnext.utilities.doctype.contact.contact import get_contact_details @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 @@ def set_price_list(out, party, party_type, given_price_list): 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 40db97feb8..c9b1206cc1 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -25,6 +25,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) { 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 510b395ae4..959739225e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -241,14 +241,14 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ 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 } }); },