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

Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix

Browse Source 
perf: Customer contact column in accounts receivable report
This commit is contained in:
Nabin Hait 2019-01-08 11:52:20 +05:30 committed by GitHub
commit 4e3e784691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -32,6 +32,15 @@ class ReceivablePayableReport(object):
columns += [_(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"] columns += [_(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"]
if args.get("party_type") == 'Customer':
columns.append({
"label": _("Customer Contact"),
"fieldtype": "Link",
"fieldname": "contact",
"options":"Contact",
"width": 100
})
if party_naming_by == "Naming Series": if party_naming_by == "Naming Series":
columns += [args.get("party_type") + " Name::110"] columns += [args.get("party_type") + " Name::110"]
@ -282,6 +291,9 @@ class ReceivablePayableReport(object):
if party_naming_by == "Naming Series": if party_naming_by == "Naming Series":
row += [self.get_party_name(gle.party_type, gle.party)] row += [self.get_party_name(gle.party_type, gle.party)]
if args.get("party_type") == 'Customer':
row += [self.get_customer_contact(gle.party_type, gle.party)]
# get due date # get due date
if not due_date: if not due_date:
due_date = self.voucher_details.get(gle.voucher_no, {}).get("due_date", "") due_date = self.voucher_details.get(gle.voucher_no, {}).get("due_date", "")
@ -407,6 +419,9 @@ class ReceivablePayableReport(object):
def get_party_name(self, party_type, party_name): def get_party_name(self, party_type, party_name):
return self.get_party_map(party_type).get(party_name, {}).get("customer_name" if party_type == "Customer" else "supplier_name") or "" return self.get_party_map(party_type).get(party_name, {}).get("customer_name" if party_type == "Customer" else "supplier_name") or ""
def get_customer_contact(self, party_type, party_name):
return self.get_party_map(party_type).get(party_name, {}).get("customer_primary_contact")
def get_territory(self, party_name): def get_territory(self, party_name):
return self.get_party_map("Customer").get(party_name, {}).get("territory") or "" return self.get_party_map("Customer").get(party_name, {}).get("territory") or ""
@ -419,7 +434,7 @@ class ReceivablePayableReport(object):
def get_party_map(self, party_type): def get_party_map(self, party_type):
if not hasattr(self, "party_map"): if not hasattr(self, "party_map"):
if party_type == "Customer": if party_type == "Customer":
select_fields = "name, customer_name, territory, customer_group" select_fields = "name, customer_name, territory, customer_group, customer_primary_contact"
elif party_type == "Supplier": elif party_type == "Supplier":
select_fields = "name, supplier_name, supplier_group" select_fields = "name, supplier_name, supplier_group"

12
erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
View File

@ -21,24 +21,24 @@ class TestAccountsReceivable(unittest.TestCase):
expected_data = [[100,30], [100,50], [100,20]] expected_data = [[100,30], [100,50], [100,20]]
self.assertEqual(expected_data[0], report[1][0][6:8]) self.assertEqual(expected_data[0], report[1][0][7:9])
self.assertEqual(expected_data[1], report[1][1][6:8]) self.assertEqual(expected_data[1], report[1][1][7:9])
self.assertEqual(expected_data[2], report[1][2][6:8]) self.assertEqual(expected_data[2], report[1][2][7:9])
make_payment(name) make_payment(name)
report = execute(filters) report = execute(filters)
expected_data_after_payment = [[100,50], [100,20]] expected_data_after_payment = [[100,50], [100,20]]
self.assertEqual(expected_data_after_payment[0], report[1][0][6:8]) self.assertEqual(expected_data_after_payment[0], report[1][0][7:9])
self.assertEqual(expected_data_after_payment[1], report[1][1][6:8]) self.assertEqual(expected_data_after_payment[1], report[1][1][7:9])
make_credit_note(name) make_credit_note(name)
report = execute(filters) report = execute(filters)
expected_data_after_credit_note = [[100,100,30,100,-30]] expected_data_after_credit_note = [[100,100,30,100,-30]]
self.assertEqual(expected_data_after_credit_note[0], report[1][0][6:11]) self.assertEqual(expected_data_after_credit_note[0], report[1][0][7:12])
def make_sales_invoice(): def make_sales_invoice():