From 92614cb446eb531ac6d5521bba7e7f5cbbe81b2e Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Thu, 22 May 2025 12:23:34 +0530 Subject: [PATCH] fix: test cases --- .../asset_capitalization.py | 2 +- .../test_asset_capitalization.py | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 546adf3aee1..73d0ce154e3 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -140,7 +140,7 @@ class AssetCapitalization(StockController): self.update_target_asset() def set_title(self): - self.title = self.target_asset_name or self.target_item_name or self.target_item_code + self.title = self.target_asset_name or self.target_item_code def set_missing_values(self, for_validate=False): target_item_details = get_target_item_details(self.target_item_code, self.company) diff --git a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py index 7cc04cfa5fc..9e98690a97d 100644 --- a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py @@ -59,10 +59,16 @@ class TestAssetCapitalization(IntegrationTestCase): company=company, ) + wip_composite_asset = create_asset( + asset_name="Asset Capitalization WIP Composite Asset", + is_composite_asset=1, + warehouse="Stores - TCP1", + company=company, + ) + # Create and submit Asset Captitalization asset_capitalization = create_asset_capitalization( - capitalization_method="Create a new composite asset", - target_item_code="Macbook Pro", + target_asset=wip_composite_asset.name, target_asset_location="Test Location", stock_qty=stock_qty, stock_rate=stock_rate, @@ -148,10 +154,16 @@ class TestAssetCapitalization(IntegrationTestCase): company=company, ) + wip_composite_asset = create_asset( + asset_name="Asset Capitalization WIP Composite Asset", + is_composite_asset=1, + warehouse="Stores - TCP1", + company=company, + ) + # Create and submit Asset Captitalization asset_capitalization = create_asset_capitalization( - capitalization_method="Create a new composite asset", - target_item_code="Macbook Pro", + target_asset=wip_composite_asset.name, target_asset_location="Test Location", stock_qty=stock_qty, stock_rate=stock_rate, @@ -240,7 +252,6 @@ class TestAssetCapitalization(IntegrationTestCase): # Create and submit Asset Captitalization asset_capitalization = create_asset_capitalization( - capitalization_method="Choose a WIP composite asset", target_asset=wip_composite_asset.name, target_asset_location="Test Location", stock_qty=stock_qty, @@ -251,7 +262,6 @@ class TestAssetCapitalization(IntegrationTestCase): ) # Test Asset Capitalization values - self.assertEqual(asset_capitalization.capitalization_method, "Choose a WIP composite asset") self.assertEqual(asset_capitalization.target_qty, 1) self.assertEqual(asset_capitalization.stock_items[0].valuation_rate, stock_rate) @@ -310,7 +320,6 @@ class TestAssetCapitalization(IntegrationTestCase): # Create and submit Asset Captitalization asset_capitalization = create_asset_capitalization( - capitalization_method="Choose a WIP composite asset", target_asset=wip_composite_asset.name, target_asset_location="Test Location", service_qty=service_qty, @@ -362,7 +371,6 @@ def create_asset_capitalization(**args): asset_capitalization = frappe.new_doc("Asset Capitalization") asset_capitalization.update( { - "capitalization_method": args.capitalization_method or None, "company": company, "posting_date": args.posting_date or now.strftime("%Y-%m-%d"), "posting_time": args.posting_time or now.strftime("%H:%M:%S.%f"),