nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 02:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show currency symbol in base currency in fixed asset register report

Browse Source 
(cherry picked from commit 8b6220efd8)
This commit is contained in:
Nabin Hait
2024-03-21 12:43:08 +05:30
committed by Mergify
parent 6607e6b2c3
commit 79043894b2
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
View File

@@ -149,6 +149,7 @@ def get_data(filters):
"asset_category": asset.asset_category,
"purchase_date": asset.purchase_date,
"asset_value": asset_value,
"company": asset.company,
}
data.append(row)
@@ -379,30 +380,37 @@ def get_columns(filters):
"label": _("Gross Purchase Amount"),
"fieldname": "gross_purchase_amount",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 250,
},
{
"label": _("Opening Accumulated Depreciation"),
"fieldname": "opening_accumulated_depreciation",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 250,
},
{
"label": _("Depreciated Amount"),
"fieldname": "depreciated_amount",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 250,
},
{
"label": _("Asset Value"),
"fieldname": "asset_value",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 250,
},
{
"label": _("Company"),
"fieldname": "company",
"fieldtype": "Link",
"options": "Company",
"width": 120,
},
]
return [
@@ -433,28 +441,28 @@ def get_columns(filters):
"label": _("Gross Purchase Amount"),
"fieldname": "gross_purchase_amount",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 100,
},
{
"label": _("Asset Value"),
"fieldname": "asset_value",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 100,
},
{
"label": _("Opening Accumulated Depreciation"),
"fieldname": "opening_accumulated_depreciation",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 90,
},
{
"label": _("Depreciated Amount"),
"fieldname": "depreciated_amount",
"fieldtype": "Currency",
"options": "company:currency",
"options": "Company:company:default_currency",
"width": 100,
},
{
@@ -479,4 +487,11 @@ def get_columns(filters):
"options": "Location",
"width": 100,
},
{
"label": _("Company"),
"fieldname": "company",
"fieldtype": "Link",
"options": "Company",
"width": 120,
},
]