nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 08:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes] delete company transaction and other minor fixes

Browse Source
This commit is contained in:
mbauskar
2017-01-23 11:27:47 +05:30
parent 83f4780f74
commit 7fa039f15c
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/utilities/address_and_contact.py
View File

@@ -8,9 +8,12 @@ def load_address_and_contact(doc, key):
"""Loads address list and contact list in `__onload`"""
from frappe.geo.doctype.address.address import get_address_display
address_list = [frappe.get_value('Address', a.parent, '*')
for a in frappe.get_all('Dynamic Link', fields='parent',
filters=dict(parenttype='Address', link_doctype=doc.doctype, link_name=doc.name))]
filters = [
["Dynamic Link", "link_doctype", "=", doc.doctype],
["Dynamic Link", "link_name", "=", doc.name],
["Dynamic Link", "parenttype", "=", "Address"],
]
address_list = frappe.get_all("Address", filters=filters, fields=["*"])
address_list = [a.update({"display": get_address_display(a)})
for a in address_list]
@@ -23,9 +26,12 @@ def load_address_and_contact(doc, key):
doc.set_onload('addr_list', address_list)
if doc.doctype != "Lead":
contact_list = [frappe.get_value('Contact', a.parent, '*')
for a in frappe.get_all('Dynamic Link', fields='parent',
filters=dict(parenttype='Contact', link_doctype=doc.doctype, link_name=doc.name))]
filters = [
["Dynamic Link", "link_doctype", "=", doc.doctype],
["Dynamic Link", "link_name", "=", doc.name],
["Dynamic Link", "parenttype", "=", "Contact"],
]
contact_list = frappe.get_all("Contact", filters=filters, fields=["*"])
contact_list = sorted(contact_list,
lambda a, b: