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

Set default only if customer_address not found (#15605)

Browse Source 
* Set default only if customer_address not found

* Similar fix for Purchase Invoice and shipping_address
This commit is contained in:
Shreya Shah 2018-10-07 11:42:07 +05:30 committed by Nabin Hait
parent e7e269d4a4
commit 5615cb4735
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/party.py
View File

@ -22,17 +22,18 @@ class DuplicatePartyAccountError(frappe.ValidationError): pass
@frappe.whitelist() @frappe.whitelist()
def get_party_details(party=None, account=None, party_type="Customer", company=None, posting_date=None, def get_party_details(party=None, account=None, party_type="Customer", company=None, posting_date=None,
bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False, fetch_payment_terms_template=True): bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False, fetch_payment_terms_template=True, party_address=None):
if not party: if not party:
return {} return {}
if not frappe.db.exists(party_type, party): if not frappe.db.exists(party_type, party):
frappe.throw(_("{0}: {1} does not exists").format(party_type, party)) frappe.throw(_("{0}: {1} does not exists").format(party_type, party))
return _get_party_details(party, account, party_type, return _get_party_details(party, account, party_type,
company, posting_date, bill_date, price_list, currency, doctype, ignore_permissions, fetch_payment_terms_template) company, posting_date, bill_date, price_list, currency, doctype, ignore_permissions, fetch_payment_terms_template, party_address)
def _get_party_details(party=None, account=None, party_type="Customer", company=None, posting_date=None, def _get_party_details(party=None, account=None, party_type="Customer", company=None, posting_date=None,
bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False, fetch_payment_terms_template=True): bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False,
fetch_payment_terms_template=True, party_address=None, shipping_address=None):
out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, bill_date, doctype)) out = frappe._dict(set_account_and_due_date(party, account, party_type, company, posting_date, bill_date, doctype))
party = out[party_type.lower()] party = out[party_type.lower()]
@ -45,7 +46,7 @@ def _get_party_details(party=None, account=None, party_type="Customer", company=
out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_group) out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_group)
out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company) out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company)
set_address_details(out, party, party_type, doctype, company) set_address_details(out, party, party_type, doctype, company, party_address, shipping_address)
set_contact_details(out, party, party_type) set_contact_details(out, party, party_type)
set_other_values(out, party, party_type) set_other_values(out, party, party_type)
set_price_list(out, party, party_type, price_list) set_price_list(out, party, party_type, price_list)
@ -71,19 +72,17 @@ def _get_party_details(party=None, account=None, party_type="Customer", company=
return out return out
def set_address_details(out, party, party_type, doctype=None, company=None): def set_address_details(out, party, party_type, doctype=None, company=None, party_address=None, shipping_address=None):
billing_address_field = "customer_address" if party_type == "Lead" \ billing_address_field = "customer_address" if party_type == "Lead" \
else party_type.lower() + "_address" else party_type.lower() + "_address"
out[billing_address_field] = get_default_address(party_type, party.name) out[billing_address_field] = party_address or get_default_address(party_type, party.name)
if doctype: if doctype:
out.update(get_fetch_values(doctype, billing_address_field, out[billing_address_field])) out.update(get_fetch_values(doctype, billing_address_field, out[billing_address_field]))
# address display # address display
out.address_display = get_address_display(out[billing_address_field]) out.address_display = get_address_display(out[billing_address_field])
# shipping address # shipping address
if party_type in ["Customer", "Lead"]: if party_type in ["Customer", "Lead"]:
out.shipping_address_name = get_party_shipping_address(party_type, party.name) out.shipping_address_name = shipping_address or get_party_shipping_address(party_type, party.name)
out.shipping_address = get_address_display(out["shipping_address_name"]) out.shipping_address = get_address_display(out["shipping_address_name"])
if doctype: if doctype:
out.update(get_fetch_values(doctype, 'shipping_address_name', out.shipping_address_name)) out.update(get_fetch_values(doctype, 'shipping_address_name', out.shipping_address_name))

3
erpnext/controllers/buying_controller.py
View File

@ -68,7 +68,8 @@ class BuyingController(StockController):
# set contact and address details for supplier, if they are not mentioned # set contact and address details for supplier, if they are not mentioned
if getattr(self, "supplier", None): if getattr(self, "supplier", None):
self.update_if_missing(get_party_details(self.supplier, party_type="Supplier", ignore_permissions=self.flags.ignore_permissions, doctype=self.doctype, company=self.company)) self.update_if_missing(get_party_details(self.supplier, party_type="Supplier", ignore_permissions=self.flags.ignore_permissions,
doctype=self.doctype, company=self.company, party_address=self.supplier_address))
self.set_missing_item_details(for_validate) self.set_missing_item_details(for_validate)

5
erpnext/controllers/selling_controller.py
View File

@ -44,6 +44,7 @@ class SellingController(StockController):
set_default_income_account_for_item(self) set_default_income_account_for_item(self)
def set_missing_values(self, for_validate=False): def set_missing_values(self, for_validate=False):
super(SellingController, self).set_missing_values(for_validate) super(SellingController, self).set_missing_values(for_validate)
# set contact and address details for customer, if they are not mentioned # set contact and address details for customer, if they are not mentioned
@ -61,10 +62,10 @@ class SellingController(StockController):
party_details = _get_party_details(self.customer, party_details = _get_party_details(self.customer,
ignore_permissions=self.flags.ignore_permissions, ignore_permissions=self.flags.ignore_permissions,
doctype=self.doctype, company=self.company, doctype=self.doctype, company=self.company,
fetch_payment_terms_template=fetch_payment_terms_template) fetch_payment_terms_template=fetch_payment_terms_template,
party_address=self.customer_address, shipping_address=self.shipping_address)
if not self.meta.get_field("sales_team"): if not self.meta.get_field("sales_team"):
party_details.pop("sales_team") party_details.pop("sales_team")
self.update_if_missing(party_details) self.update_if_missing(party_details)
elif getattr(self, "lead", None): elif getattr(self, "lead", None):