nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48840 from khushi8112/finance-books-issue-when-asset-splitting

Browse Source 
fix: finance books issue when asset splitting
This commit is contained in:
Khushi Rawat
2025-07-29 18:01:37 +05:30
committed by GitHub
parent 1d85da43a6 bc1d3ea017
commit 21bdf6ef14
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,9 @@ class Asset(AccountsController):
) )
def set_missing_values(self): def set_missing_values(self):
if not self.calculate_depreciation:
return
if not self.asset_category: if not self.asset_category:
self.asset_category = frappe.get_cached_value("Item", self.item_code, "asset_category") self.asset_category = frappe.get_cached_value("Item", self.item_code, "asset_category")
@@ -1297,7 +1300,6 @@ def create_new_asset_after_split(asset, split_qty):
) )
new_asset.insert() new_asset.insert()
add_asset_activity( add_asset_activity(
new_asset.name, new_asset.name,
_("Asset created after being split from Asset {0}").format(get_link_to_form("Asset", asset.name)), _("Asset created after being split from Asset {0}").format(get_link_to_form("Asset", asset.name)),

21
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -445,6 +445,27 @@ class TestAsset(AssetSetup):
self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold") self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
def test_asset_splitting_without_depreciation(self):
asset = create_asset(
calculate_depreciation=0,
asset_quantity=10,
available_for_use_date="2020-01-01",
purchase_date="2020-01-01",
gross_purchase_amount=120000,
submit=1,
)
self.assertEqual(asset.asset_quantity, 10)
self.assertEqual(asset.gross_purchase_amount, 120000)
new_asset = split_asset(asset.name, 2)
asset.load_from_db()
self.assertEqual(asset.asset_quantity, 8)
self.assertEqual(asset.gross_purchase_amount, 96000)
self.assertEqual(new_asset.asset_quantity, 2)
self.assertEqual(new_asset.gross_purchase_amount, 24000)
def test_asset_splitting(self): def test_asset_splitting(self):
asset = create_asset( asset = create_asset(
calculate_depreciation=1, calculate_depreciation=1,