fixed column fieldnames for translations (#13406)
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index 10f3262..78015b4 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -91,8 +91,8 @@
<thead>
<tr>
{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
- <th style="width: 10%">{%= __("Date") %}</th>
- <th style="width: 15%">{%= __("Ref") %}</th>
+ <th style="width: 15%">{%= __("Date") %}</th>
+ <th style="width: 20%">{%= __("Reference") %}</th>
{% if(!filters.show_pdc_in_print) { %}
<th style="width: 20%">{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %}</th>
{% } %}
@@ -125,9 +125,9 @@
<tr>
{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
{% if(data[i][__("Customer")] || data[i][__("Supplier")]) { %}
- <td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
- <td>{%= data[i][__("Voucher Type")] %}
- <br>{%= data[i][__("Voucher No")] %}</td>
+ <td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td>
+ <td>{%= data[i]["voucher_type"] %}
+ <br>{%= data[i]["voucher_no"] %}</td>
{% if(!filters.show_pdc_in_print) { %}
<td>
{% if(!(filters.customer || filters.supplier)) { %}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 02f247b..b971327 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -22,13 +22,35 @@
return columns, data, None, chart
def get_columns(self, party_naming_by, args):
- columns = [_("Posting Date") + ":Date:80", _(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"]
+ columns = []
+ columns.append({
+ "label": _("Posting Date"),
+ "fieldtype": "Date",
+ "fieldname": "posting_date",
+ "width": 90
+ })
+
+ columns += [_(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"]
if party_naming_by == "Naming Series":
columns += [args.get("party_type") + " Name::110"]
- columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":120",
- _("Due Date") + ":Date:80"]
+ columns.append({
+ "label": _("Voucher Type"),
+ "fieldtype": "Data",
+ "fieldname": "voucher_type",
+ "width": 110
+ })
+
+ columns.append({
+ "label": _("Voucher No"),
+ "fieldtype": "Dynamic Link",
+ "fieldname": "voucher_no",
+ "width": 110,
+ "options": "voucher_type",
+ })
+
+ columns += [_("Due Date") + ":Date:80"]
if args.get("party_type") == "Supplier":
columns += [_("Bill No") + "::80", _("Bill Date") + ":Date:80"]