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

Get party details fixes

Browse Source
This commit is contained in:
Nabin Hait 2014-06-18 16:40:27 +05:30 committed by Anand Doshi
parent c226292d8e
commit 3b7dd0396f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/party.py
View File

@ -12,13 +12,14 @@ from erpnext.utilities.doctype.contact.contact import get_contact_details
@frappe.whitelist() @frappe.whitelist()
def get_party_details(party=None, account=None, party_type="Customer", company=None, 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, def _get_party_details(party=None, account=None, party_type="Customer", company=None,
posting_date=None, price_list=None, currency=None, ignore_permissions=False): 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)) out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, doctype))
party = out[party_type.lower()] 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 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): def set_account_and_due_date(party, account, party_type, company, posting_date, doctype):
if not posting_date: if doctype not in ["Sales Invoice", "Purchase Invoice"]:
# not an invoice # not an invoice
return { return {
party_type.lower(): party party_type.lower(): party

1
erpnext/public/js/utils/party.js
View File

@ -25,6 +25,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
args.currency = frm.doc.currency; args.currency = frm.doc.currency;
args.company = frm.doc.company; args.company = frm.doc.company;
args.doctype = frm.doc.doctype;
frappe.call({ frappe.call({
method: method, method: method,
args: args, args: args,

4
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -241,14 +241,14 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
customer: function() { customer: function() {
return this.frm.call({ return this.frm.call({
method: "erpnext.accounts.party.get_party_details", 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() { supplier: function() {
return this.frm.call({ return this.frm.call({
method: "erpnext.accounts.party.get_party_details", 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 }
}); });
}, },