From e8e8d233abd7901236c4224fd1053cca103bed20 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Fri, 6 Feb 2026 01:06:20 +0530 Subject: [PATCH] fix: test cases fixes related to new select box change --- erpnext/assets/doctype/asset/asset.py | 4 +-- .../test_asset_capitalization.py | 29 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 9cdea89ccf9..6954a1d752d 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -254,7 +254,7 @@ class Asset(AccountsController): self.reload() if ( not self.booked_fixed_asset - and self.asset_type == "Composite Component" + and self.asset_type != "Composite Component" and self.validate_make_gl_entry() ): self.make_gl_entries() @@ -1397,7 +1397,7 @@ def process_asset_split(existing_asset, split_qty, splitted_asset=None, is_new_a def set_split_asset_values(asset_doc, scaling_factor, split_qty, existing_asset, is_new_asset): asset_doc.net_purchase_amount = existing_asset.net_purchase_amount * scaling_factor - asset_doc.purchase_amount = existing_asset.net_purchase_amount + asset_doc.purchase_amount = existing_asset.net_purchase_amount * scaling_factor asset_doc.additional_asset_cost = existing_asset.additional_asset_cost * scaling_factor asset_doc.total_asset_cost = asset_doc.net_purchase_amount + asset_doc.additional_asset_cost asset_doc.opening_accumulated_depreciation = ( diff --git a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py index bdac6e73e07..0bc9e629111 100644 --- a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py @@ -9,9 +9,11 @@ from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries from erpnext.assets.doctype.asset.test_asset import ( create_asset, create_asset_data, + create_fixed_asset_item, set_depreciation_settings_in_company, ) from erpnext.stock.doctype.item.test_item import create_item +from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import ( make_serial_batch_bundle, ) @@ -364,20 +366,33 @@ class TestAssetCapitalization(IntegrationTestCase): consumed_asset_value = 100000 - consumed_asset = create_asset( - asset_name="Asset Capitalization Consumable Asset", - asset_value=consumed_asset_value, - submit=1, - warehouse="Stores - _TC", - asset_type="Composite Component", + item = create_fixed_asset_item("Asset Capitalization Consumable Asset") + + pr = make_purchase_receipt( + item_code=item.item_code, + qty=1, + rate=consumed_asset_value, company=company, + warehouse="Stores - TCP1", ) + consumed_asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name") + consumed_asset_doc = frappe.get_doc("Asset", consumed_asset_name) + + consumed_asset_doc.update( + { + "asset_type": "Composite Component", + "purchase_date": pr.posting_date, + "available_for_use_date": pr.posting_date, + } + ) + consumed_asset_doc.save() + consumed_asset_doc.submit() # Create and submit Asset Captitalization asset_capitalization = create_asset_capitalization( target_asset=wip_composite_asset.name, target_asset_location="Test Location", - consumed_asset=consumed_asset.name, + consumed_asset=consumed_asset_doc.name, company=company, submit=1, )