Merge branch 'develop' into fix-payment-order

This commit is contained in:
Mangesh-Khairnar
2019-08-16 12:42:26 +05:30
committed by GitHub

View File

@@ -33,6 +33,9 @@ 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 party_naming_by == "Naming Series":
columns += [args.get("party_type") + " Name::110"]
if args.get("party_type") == 'Customer': if args.get("party_type") == 'Customer':
columns.append({ columns.append({
"label": _("Customer Contact"), "label": _("Customer Contact"),
@@ -42,9 +45,6 @@ class ReceivablePayableReport(object):
"width": 100 "width": 100
}) })
if party_naming_by == "Naming Series":
columns += [args.get("party_type") + " Name::110"]
columns.append({ columns.append({
"label": _("Voucher Type"), "label": _("Voucher Type"),
"fieldtype": "Data", "fieldtype": "Data",