nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-15 04:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: test cases fixes related to new select box change

Browse Source 
(cherry picked from commit e8e8d233ab)
This commit is contained in:
khushi8112
2026-02-06 01:06:20 +05:30
parent 27c3c1dee0
commit 3f11d0b8ad
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/doctype/asset/asset.py
View File

@@ -254,7 +254,7 @@ class Asset(AccountsController):
self.reload() self.reload()
if ( if (
not self.booked_fixed_asset not self.booked_fixed_asset
and self.asset_type == "Composite Component" and self.asset_type != "Composite Component"
and self.validate_make_gl_entry() and self.validate_make_gl_entry()
): ):
self.make_gl_entries() self.make_gl_entries()
@@ -1399,7 +1399,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): 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.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.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.total_asset_cost = asset_doc.net_purchase_amount + asset_doc.additional_asset_cost
asset_doc.opening_accumulated_depreciation = ( asset_doc.opening_accumulated_depreciation = (

29
erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
View File

@@ -10,12 +10,14 @@ from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries
from erpnext.assets.doctype.asset.test_asset import ( from erpnext.assets.doctype.asset.test_asset import (
create_asset, create_asset,
create_asset_data, create_asset_data,
create_fixed_asset_item,
set_depreciation_settings_in_company, set_depreciation_settings_in_company,
) )
from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import ( from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import (
get_asset_depr_schedule_doc, get_asset_depr_schedule_doc,
) )
from erpnext.stock.doctype.item.test_item import create_item 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 ( from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
make_serial_batch_bundle, make_serial_batch_bundle,
) )
@@ -368,20 +370,33 @@ class TestAssetCapitalization(IntegrationTestCase):
consumed_asset_value = 100000 consumed_asset_value = 100000
consumed_asset = create_asset( item = create_fixed_asset_item("Asset Capitalization Consumable Asset")
asset_name="Asset Capitalization Consumable Asset",
asset_value=consumed_asset_value, pr = make_purchase_receipt(
submit=1, item_code=item.item_code,
warehouse="Stores - _TC", qty=1,
asset_type="Composite Component", rate=consumed_asset_value,
company=company, 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 # Create and submit Asset Captitalization
asset_capitalization = create_asset_capitalization( asset_capitalization = create_asset_capitalization(
target_asset=wip_composite_asset.name, target_asset=wip_composite_asset.name,
target_asset_location="Test Location", target_asset_location="Test Location",
consumed_asset=consumed_asset.name, consumed_asset=consumed_asset_doc.name,
company=company, company=company,
submit=1, submit=1,
) )