From 5139dce0a2edf9433d2ede180f4996a62493494e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Crahulgupta8848=E2=80=9D?= <“rahul.gupta@8848digital.com”> Date: Tue, 30 Jul 2024 14:29:08 +0530 Subject: [PATCH] fix: accounting dimenstion field not visible in asset depriciation --- .../asset_modification/custom_fields/asset_movement.json | 2 ++ .../accounting_dimension/accounting_dimension_override.py | 7 +++++-- .../asset_depreciation_schedule_override.py | 1 - .../asset_component_capitalization.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/asset_customizations/asset_modification/custom_fields/asset_movement.json b/asset_customizations/asset_modification/custom_fields/asset_movement.json index 05b6945..01eac6f 100644 --- a/asset_customizations/asset_modification/custom_fields/asset_movement.json +++ b/asset_customizations/asset_modification/custom_fields/asset_movement.json @@ -7,6 +7,8 @@ "options": "Journal Entry", "label": "Journal Entry", "module": "asset_modification", + "allow_on_submit": 1, + "read_only": 1, "depends_on": "eval:doc.docstatus==1;" } ] diff --git a/asset_customizations/asset_modification/customizations/accounting_dimension/accounting_dimension_override.py b/asset_customizations/asset_modification/customizations/accounting_dimension/accounting_dimension_override.py index 082e290..c4370dc 100644 --- a/asset_customizations/asset_modification/customizations/accounting_dimension/accounting_dimension_override.py +++ b/asset_customizations/asset_modification/customizations/accounting_dimension/accounting_dimension_override.py @@ -10,8 +10,7 @@ from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( AccountingDimension, - get_accounting_dimensions, - get_doctypes_with_dimensions + get_accounting_dimensions ) class CustomAccountingDimension(AccountingDimension): @@ -189,3 +188,7 @@ def toggle_disabling(doc): custom_field_duplicate.save() frappe.clear_cache(doctype=doctype) + + +def get_doctypes_with_dimensions(): + return frappe.get_hooks("accounting_dimension_doctypes_for_asset") \ No newline at end of file diff --git a/asset_customizations/asset_modification/customizations/asset_depreciation_schedule/asset_depreciation_schedule_override.py b/asset_customizations/asset_modification/customizations/asset_depreciation_schedule/asset_depreciation_schedule_override.py index aed0de6..971098f 100644 --- a/asset_customizations/asset_modification/customizations/asset_depreciation_schedule/asset_depreciation_schedule_override.py +++ b/asset_customizations/asset_modification/customizations/asset_depreciation_schedule/asset_depreciation_schedule_override.py @@ -9,7 +9,6 @@ def set_draft_asset_depr_schedule_details(self, asset_doc, row): fields = frappe.get_list("Accounting Dimension", pluck="fieldname") self.asset = asset_doc.name - # self.cost_center = asset_doc.cost_center self.finance_book = row.finance_book self.finance_book_id = row.idx self.opening_accumulated_depreciation = asset_doc.opening_accumulated_depreciation or 0 diff --git a/asset_customizations/asset_modification/doctype/asset_component_capitalization/asset_component_capitalization.py b/asset_customizations/asset_modification/doctype/asset_component_capitalization/asset_component_capitalization.py index 460a0f1..2b12fb9 100644 --- a/asset_customizations/asset_modification/doctype/asset_component_capitalization/asset_component_capitalization.py +++ b/asset_customizations/asset_modification/doctype/asset_component_capitalization/asset_component_capitalization.py @@ -1,7 +1,7 @@ import frappe from frappe.model.document import Document from erpnext.accounts.utils import get_fiscal_year -from frappe.utils import today + class AssetComponentCapitalization(Document): def on_submit(self):