From 87e2309e8e841a97aef06e854151a6ed6d3d32fc Mon Sep 17 00:00:00 2001 From: Anand Baburajan Date: Tue, 22 Aug 2023 15:30:04 +0530 Subject: [PATCH] fix: avoid duplicate asset activity entries on asset capitalization (#36756) --- erpnext/assets/doctype/asset/asset.py | 13 ++++++++----- .../asset_capitalization/asset_capitalization.py | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index ce894eb00d..ddb09c1f44 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -96,11 +96,14 @@ class Asset(AccountsController): "Asset Depreciation Schedules created:
{0}

Please check, edit if needed, and submit the Asset." ).format(asset_depr_schedules_links) ) - if not frappe.db.exists( - { - "doctype": "Asset Activity", - "asset": self.name, - } + if ( + not frappe.db.exists( + { + "doctype": "Asset Activity", + "asset": self.name, + } + ) + and not self.flags.asset_created_via_asset_capitalization ): add_asset_activity(self.name, _("Asset created")) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 324b7392a8..0bf2fbb14b 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -509,6 +509,7 @@ class AssetCapitalization(StockController): asset_doc.gross_purchase_amount = total_target_asset_value asset_doc.purchase_receipt_amount = total_target_asset_value asset_doc.flags.ignore_validate = True + asset_doc.flags.asset_created_via_asset_capitalization = True asset_doc.insert() self.target_asset = asset_doc.name