From 1d2e831846adfd94d1a57fd98703450ccab7f574 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 8 Jan 2024 16:35:45 +0530 Subject: [PATCH] fix: Introduced company field to show amounts in company currency (cherry picked from commit eab22eb2822055e0e04adf853879237c00988572) --- .../asset_depreciation_schedule.json | 11 ++++++++++- .../asset_depreciation_schedule.py | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json index be35914251..73838163d3 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -9,6 +9,7 @@ "field_order": [ "asset", "naming_series", + "company", "column_break_2", "gross_purchase_amount", "opening_accumulated_depreciation", @@ -193,12 +194,20 @@ "fieldtype": "Check", "label": "Depreciate based on shifts", "read_only": 1 + }, + { + "fetch_from": "asset.company", + "fieldname": "company", + "fieldtype": "Link", + "label": "Company", + "options": "Company", + "read_only": 1 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2023-11-29 00:57:00.461998", + "modified": "2024-01-08 16:31:04.533928", "modified_by": "Administrator", "module": "Assets", "name": "Asset Depreciation Schedule", diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index 67234ccd84..4c94be5320 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -35,6 +35,7 @@ class AssetDepreciationSchedule(Document): amended_from: DF.Link | None asset: DF.Link + company: DF.Link | None daily_prorata_based: DF.Check depreciation_method: DF.Literal[ "", "Straight Line", "Double Declining Balance", "Written Down Value", "Manual"