Merge branch 'develop' into fix-payment-order
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index ecf149b..97e7104 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -33,6 +33,9 @@
columns += [_(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"]
+ if party_naming_by == "Naming Series":
+ columns += [args.get("party_type") + " Name::110"]
+
if args.get("party_type") == 'Customer':
columns.append({
"label": _("Customer Contact"),
@@ -42,9 +45,6 @@
"width": 100
})
- if party_naming_by == "Naming Series":
- columns += [args.get("party_type") + " Name::110"]
-
columns.append({
"label": _("Voucher Type"),
"fieldtype": "Data",