From 23e256aedf65c8ad9fb39a507772798a374a209a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 26 Feb 2024 12:53:06 +0530 Subject: [PATCH 1/2] fix: Patch to remove cancelled asset capitalization from asset --- .../asset_capitalization/asset_capitalization.py | 4 ++++ erpnext/patches.txt | 1 + ...remove_cancelled_asset_capitalization_from_asset.py | 10 ++++++++++ 3 files changed, 15 insertions(+) create mode 100644 erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 2b5d8d0ffdd..f3464e2aba1 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -83,6 +83,10 @@ class AssetCapitalization(StockController): self.update_stock_ledger() self.make_gl_entries() self.restore_consumed_asset_items() + + def on_trash(self): + frappe.db.set_value("Asset", self.target_asset, "capitalized_in", None) + super(AssetCapitalization, self).on_trash() def cancel_target_asset(self): if self.entry_type == "Capitalization" and self.target_asset: diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 125158a5add..e0b8534f9fe 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -359,3 +359,4 @@ erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2 erpnext.patches.v14_0.set_maintain_stock_for_bom_item execute:frappe.db.set_single_value('E Commerce Settings', 'show_actual_qty', 1) erpnext.patches.v14_0.delete_orphaned_asset_movement_item_records +erpnext.patches.v14_0.remove_cancelled_asset_capitalization_from_asset diff --git a/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py b/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py new file mode 100644 index 00000000000..82f3c205582 --- /dev/null +++ b/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py @@ -0,0 +1,10 @@ +import frappe + +def execute(): + cancelled_asset_capitalizations = frappe.get_all( + "Asset Capitalization", + filters={"docstatus": 2}, + fields=["name", "target_asset"], + ) + for asset_capitalization in cancelled_asset_capitalizations: + frappe.db.set_value("Asset", asset_capitalization.target_asset, "capitalized_in", None) From ac0dd5083fd958edd03e779617c183eb7a8d8c4f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 12 Mar 2024 12:10:55 +0530 Subject: [PATCH 2/2] fix: linter issues --- .../asset_capitalization/asset_capitalization.py | 2 +- ...e_cancelled_asset_capitalization_from_asset.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index f3464e2aba1..76a660d6a9a 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -83,7 +83,7 @@ class AssetCapitalization(StockController): self.update_stock_ledger() self.make_gl_entries() self.restore_consumed_asset_items() - + def on_trash(self): frappe.db.set_value("Asset", self.target_asset, "capitalized_in", None) super(AssetCapitalization, self).on_trash() diff --git a/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py b/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py index 82f3c205582..cb39a9280e4 100644 --- a/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py +++ b/erpnext/patches/v14_0/remove_cancelled_asset_capitalization_from_asset.py @@ -1,10 +1,11 @@ import frappe + def execute(): - cancelled_asset_capitalizations = frappe.get_all( - "Asset Capitalization", - filters={"docstatus": 2}, - fields=["name", "target_asset"], - ) - for asset_capitalization in cancelled_asset_capitalizations: - frappe.db.set_value("Asset", asset_capitalization.target_asset, "capitalized_in", None) + cancelled_asset_capitalizations = frappe.get_all( + "Asset Capitalization", + filters={"docstatus": 2}, + fields=["name", "target_asset"], + ) + for asset_capitalization in cancelled_asset_capitalizations: + frappe.db.set_value("Asset", asset_capitalization.target_asset, "capitalized_in", None)