From 5de53eb0eb2a0e50ee62204aa8f01b94a84e9b39 Mon Sep 17 00:00:00 2001 From: Giovanni Lion Date: Wed, 9 Dec 2015 15:45:40 +0800 Subject: [PATCH] Voucher dynamic link fix to allow links to work if user language is not english --- .../accounts/report/accounts_receivable/accounts_receivable.py | 2 +- erpnext/accounts/report/general_ledger/general_ledger.py | 2 +- erpnext/stock/report/stock_ledger/stock_ledger.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 3168514352..89fc52c610 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -24,7 +24,7 @@ class ReceivablePayableReport(object): if party_naming_by == "Naming Series": columns += [args.get("party_type") + " Name::110"] - columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/Voucher Type:120", + columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":120", _("Due Date") + ":Date:80"] if args.get("party_type") == "Supplier": diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index e11fb0e00a..bd0bfb01ae 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -85,7 +85,7 @@ def get_columns(filters): ] columns += [ - _("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/Voucher Type:160", + _("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160", _("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150", _("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400" ] diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index c2c6d1ae7f..ac4cbbd2e0 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -33,7 +33,7 @@ def get_columns(): _("Brand") + ":Link/Brand:100", _("Description") + "::200", _("Warehouse") + ":Link/Warehouse:100", _("Stock UOM") + ":Link/UOM:100", _("Qty") + ":Float:50", _("Balance Qty") + ":Float:100", _("Incoming Rate") + ":Currency:110", _("Valuation Rate") + ":Currency:110", _("Balance Value") + ":Currency:110", - _("Voucher Type") + "::110", _("Voucher #") + ":Dynamic Link/Voucher Type:100", _("Batch") + ":Link/Batch:100", + _("Voucher Type") + "::110", _("Voucher #") + ":Dynamic Link/"+_("Voucher Type")+":100", _("Batch") + ":Link/Batch:100", _("Serial #") + ":Link/Serial No:100", _("Company") + ":Link/Company:100" ]