nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Undo unneccessary changes

Browse Source
This commit is contained in:
Deepesh Garg
2020-03-31 17:28:43 +05:30
parent d45e0e0b5b
commit cf9347d2f5
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/accounts/party.py
View File

@@ -11,7 +11,7 @@ from frappe.utils import (add_days, getdate, formatdate, date_diff,
add_years, get_timestamp, nowdate, flt, cstr, add_months, get_last_day) add_years, get_timestamp, nowdate, flt, cstr, add_months, get_last_day)
from frappe.contacts.doctype.address.address import (get_address_display, from frappe.contacts.doctype.address.address import (get_address_display,
get_default_address, get_company_address) get_default_address, get_company_address)
from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact from frappe.contacts.doctype.contact.contact import get_contact_details
from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
from erpnext import get_company_currency from erpnext import get_company_currency
@@ -46,7 +46,7 @@ def _get_party_details(party=None, account=None, party_type="Customer", company=
currency = party.default_currency if party.get("default_currency") else get_company_currency(company) currency = party.default_currency if party.get("default_currency") else get_company_currency(company)
party_address, shipping_address = set_address_details(party_details, party, party_type, doctype, company, party_address, company_address, shipping_address) party_address, shipping_address = set_address_details(party_details, party, party_type, doctype, company, party_address, company_address, shipping_address)
set_contact_details(party_details, party, party_type, doctype) set_contact_details(party_details, party, party_type)
set_other_values(party_details, party, party_type) set_other_values(party_details, party, party_type)
set_price_list(party_details, party, party_type, price_list, pos_profile) set_price_list(party_details, party, party_type, price_list, pos_profile)
@@ -115,11 +115,8 @@ def set_address_details(party_details, party, party_type, doctype=None, company=
def get_regional_address_details(party_details, doctype, company): def get_regional_address_details(party_details, doctype, company):
pass pass
def set_contact_details(party_details, party, party_type, doctype=None): def set_contact_details(party_details, party, party_type):
if doctype == 'Sales Invoice': party_details.contact_person = get_default_contact(party_type, party.name)
party_details.contact_person = get_default_billing_contact(doctype, party.name)
else:
party_details.contact_person = get_default_contact(party_type, party.name)
if not party_details.contact_person: if not party_details.contact_person:
party_details.update({ party_details.update({
@@ -617,7 +614,7 @@ def get_partywise_advanced_payment_amount(party_type, posting_date = None):
if data: if data:
return frappe._dict(data) return frappe._dict(data)
def get_default_billing_contact(doctype, name): def get_default_contact(doctype, name):
""" """
Returns default contact for the given doctype and name. Returns default contact for the given doctype and name.
Can be ordered by `contact_type` to either is_primary_contact or is_billing_contact. Can be ordered by `contact_type` to either is_primary_contact or is_billing_contact.
@@ -630,7 +627,7 @@ def get_default_billing_contact(doctype, name):
dl.link_doctype=%s AND dl.link_doctype=%s AND
dl.link_name=%s AND dl.link_name=%s AND
dl.parenttype = "Contact" dl.parenttype = "Contact"
ORDER BY is_billing_contact DESC, is_primary_contact DESC ORDER BY is_primary_contact DESC, is_billing_contact DESC
""", (doctype, name)) """, (doctype, name))
if out: if out:
try: try: