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

fix: correct gl entry when capitalizing composite component

Browse Source
This commit is contained in:
Khushi Rawat
2025-05-28 17:48:04 +05:30
parent 4d1d66e579
commit 83b32f9646
1 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
View File

@@ -13,6 +13,7 @@ import erpnext
from erpnext.assets.doctype.asset.asset import get_asset_value_after_depreciation from erpnext.assets.doctype.asset.asset import get_asset_value_after_depreciation
from erpnext.assets.doctype.asset.depreciation import ( from erpnext.assets.doctype.asset.depreciation import (
depreciate_asset, depreciate_asset,
get_disposal_account_and_cost_center,
get_gl_entries_on_asset_disposal, get_gl_entries_on_asset_disposal,
get_value_after_depreciation_on_disposal_date, get_value_after_depreciation_on_disposal_date,
reset_depreciation_schedule, reset_depreciation_schedule,
@@ -441,7 +442,11 @@ class AssetCapitalization(StockController):
self.get_gl_entries_for_consumed_asset_items(gl_entries, target_account, target_against, precision) self.get_gl_entries_for_consumed_asset_items(gl_entries, target_account, target_against, precision)
self.get_gl_entries_for_consumed_service_items(gl_entries, target_account, target_against, precision) self.get_gl_entries_for_consumed_service_items(gl_entries, target_account, target_against, precision)
self.get_gl_entries_for_target_item(gl_entries, target_account, target_against, precision) composite_component_value = self.get_composite_component_value()
self.get_gl_entries_for_target_item(
gl_entries, target_account, target_against, precision, composite_component_value
)
return gl_entries return gl_entries
@@ -493,34 +498,34 @@ class AssetCapitalization(StockController):
for item in self.asset_items: for item in self.asset_items:
asset = frappe.get_doc("Asset", item.asset) asset = frappe.get_doc("Asset", item.asset)
if asset.calculate_depreciation: if not asset.is_composite_component:
notes = _( if asset.calculate_depreciation:
"This schedule was created when Asset {0} was consumed through Asset Capitalization {1}." notes = _(
).format( "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
get_link_to_form(asset.doctype, asset.name), ).format(
get_link_to_form(self.doctype, self.get("name")), get_link_to_form(asset.doctype, asset.name),
) get_link_to_form(self.doctype, self.get("name")),
depreciate_asset(asset, self.posting_date, notes) )
asset.reload() depreciate_asset(asset, self.posting_date, notes)
asset.reload()
fixed_asset_gl_entries = get_gl_entries_on_asset_disposal( fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(
asset, asset,
item.asset_value, item.asset_value,
item.get("finance_book") or self.get("finance_book"), item.get("finance_book") or self.get("finance_book"),
self.get("doctype"), self.get("doctype"),
self.get("name"), self.get("name"),
self.get("posting_date"), self.get("posting_date"),
) )
for gle in fixed_asset_gl_entries:
gle["against"] = target_account
gl_entries.append(self.get_gl_dict(gle, item=item))
target_against.add(gle["account"])
asset.db_set("disposal_date", self.posting_date) asset.db_set("disposal_date", self.posting_date)
self.set_consumed_asset_status(asset) self.set_consumed_asset_status(asset)
for gle in fixed_asset_gl_entries:
gle["against"] = target_account
gl_entries.append(self.get_gl_dict(gle, item=item))
target_against.add(gle["account"])
def get_gl_entries_for_consumed_service_items( def get_gl_entries_for_consumed_service_items(
self, gl_entries, target_account, target_against, precision self, gl_entries, target_account, target_against, precision
): ):
@@ -543,21 +548,33 @@ class AssetCapitalization(StockController):
) )
) )
def get_gl_entries_for_target_item(self, gl_entries, target_account, target_against, precision): def get_composite_component_value(self):
composite_component_value = 0
for item in self.asset_items:
asset = frappe.db.get_value("Asset", item.asset, ["is_composite_component"], as_dict=True)
if asset and asset.is_composite_component:
composite_component_value += flt(item.asset_value, item.precision("asset_value"))
return composite_component_value
def get_gl_entries_for_target_item(
self, gl_entries, target_account, target_against, precision, composite_component_value
):
if self.target_is_fixed_asset: if self.target_is_fixed_asset:
# Capitalization total_value = flt(self.total_value - composite_component_value, precision)
gl_entries.append( if total_value:
self.get_gl_dict( # Capitalization
{ gl_entries.append(
"account": target_account, self.get_gl_dict(
"against": ", ".join(target_against), {
"remarks": self.get("remarks") or _("Accounting Entry for Asset"), "account": target_account,
"debit": flt(self.total_value, precision), "against": ", ".join(target_against),
"cost_center": self.get("cost_center"), "remarks": self.get("remarks") or _("Accounting Entry for Asset"),
}, "debit": total_value,
item=self, "cost_center": self.get("cost_center"),
},
item=self,
)
) )
)
def create_target_asset(self): def create_target_asset(self):
if self.capitalization_method != "Create a new composite asset": if self.capitalization_method != "Create a new composite asset":