CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 16:56:57 +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 cf74f8312e
commit cfe5f009f6
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/pos_register/pos_register.py
View File

@@ -62,7 +62,7 @@ def get_pos_entries(filters, group_by_field):
return frappe.db.sql( return frappe.db.sql(
""" """
SELECT SELECT
p.posting_date, p.name as pos_invoice, p.pos_profile, p.posting_date, p.name as pos_invoice, p.pos_profile, p.company,
p.owner, p.customer, p.is_return, p.base_grand_total as grand_total {select_mop_field} p.owner, p.customer, p.is_return, p.base_grand_total as grand_total {select_mop_field}
FROM FROM
`tabPOS Invoice` p {from_sales_invoice_payment} `tabPOS Invoice` p {from_sales_invoice_payment}
@@ -207,14 +207,14 @@ def get_columns(filters):
"label": _("Grand Total"), "label": _("Grand Total"),
"fieldname": "grand_total", "fieldname": "grand_total",
"fieldtype": "Currency", "fieldtype": "Currency",
"options": "company:currency", "options": "Company:company:default_currency",
"width": 120, "width": 120,
}, },
{ {
"label": _("Paid Amount"), "label": _("Paid Amount"),
"fieldname": "paid_amount", "fieldname": "paid_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"options": "company:currency", "options": "Company:company:default_currency",
"width": 120, "width": 120,
}, },
{ {
@@ -224,6 +224,13 @@ def get_columns(filters):
"width": 150, "width": 150,
}, },
{"label": _("Is Return"), "fieldname": "is_return", "fieldtype": "Data", "width": 80}, {"label": _("Is Return"), "fieldname": "is_return", "fieldtype": "Data", "width": 80},
{
"label": _("Company"),
"fieldname": "company",
"fieldtype": "Link",
"options": "Company",
"width": 120,
},
] ]
return columns return columns

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