vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: display all addresses and contacts

Browse source
This commit is contained in:
Himanshu Warekar 2019-03-29 12:25:16 +05:30
parent d3a2122ef9
commit 0a2911aa3f
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
View file

@ -67,10 +67,14 @@ def get_reference_addresses_and_contact(reference_doctype, reference_name):
result.extend(add_blank_columns_for("Address"))
data.append(result)
else:
result = [reference_name]
result.extend(list(addresses) or add_blank_columns_for("Address"))
result.extend(list(contacts) or add_blank_columns_for("Contact"))
data.append(result)
max_length = max(len(addresses), len(contacts))
for idx in range(0, max_length):
result = [reference_name]
result.extend(list(addresses[idx].values()) if idx < len(addresses) else add_blank_columns_for("Address"))
result.extend(list(contacts[idx].values()) if idx < len(contacts) else add_blank_columns_for("Contact"))
data.append(result)
return data
@ -81,9 +85,14 @@ def get_reference_details(reference_doctype, doctype, reference_list, reference_
]
fields = ["`tabDynamic Link`.link_name"] + field_map.get(doctype, [])
records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True)
records = frappe.get_list(doctype, filters=filters, fields=fields)
temp_records = list()
for d in records:
reference_details[d[0]][frappe.scrub(doctype)] = d[1:]
d.pop('link_name')
temp_records.append(d)
reference_details[reference_list[0]][frappe.scrub(doctype)] = temp_records
return reference_details
def add_blank_columns_for(doctype):