Merge pull request #4450 from venetanji/develop

Fix dynamic link in reports to generate correct link when user language is not english
This commit is contained in:
Nabin Hait 2015-12-09 13:57:45 +05:30
commit d595534431
3 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ class ReceivablePayableReport(object):
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"]
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"] _("Due Date") + ":Date:80"]
if args.get("party_type") == "Supplier": if args.get("party_type") == "Supplier":

View File

@ -85,7 +85,7 @@ def get_columns(filters):
] ]
columns += [ 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", _("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
_("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400" _("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400"
] ]

View File

@ -33,7 +33,7 @@ def get_columns():
_("Brand") + ":Link/Brand:100", _("Description") + "::200", _("Warehouse") + ":Link/Warehouse:100", _("Brand") + ":Link/Brand:100", _("Description") + "::200", _("Warehouse") + ":Link/Warehouse:100",
_("Stock UOM") + ":Link/UOM:100", _("Qty") + ":Float:50", _("Balance Qty") + ":Float: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", _("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" _("Serial #") + ":Link/Serial No:100", _("Company") + ":Link/Company:100"
] ]