From 612fa7c67290be5704394360e71845b75f4f727e Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 16 May 2025 15:02:26 +0530 Subject: [PATCH 1/2] fix: alias name and parent to prevent child row mapping issues (cherry picked from commit a418e377f43b30d0f57b5f493c4765408ae166ff) --- .../asset_capitalization/asset_capitalization.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 1d36eae1d61..fc0625edf9b 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -875,8 +875,8 @@ def get_items_tagged_to_wip_composite_asset(params): "valuation_rate", "amount", "is_fixed_asset", - "parent", - "name", + "parent as purchase_receipt", + "name as purchase_receipt_item", ] pr_items = frappe.get_all( @@ -905,7 +905,7 @@ def process_stock_item(d): stock_capitalized = frappe.db.exists( "Asset Capitalization Stock Item", { - "purchase_receipt_item": d.name, + "purchase_receipt_item": d.purchase_receipt_item, "parentfield": "stock_items", "parenttype": "Asset Capitalization", "docstatus": 1, @@ -916,7 +916,7 @@ def process_stock_item(d): return None stock_item_data = frappe._dict(d) - stock_item_data.purchase_receipt_item = d.name + stock_item_data.purchase_receipt_item = d.purchase_receipt_item return stock_item_data @@ -925,7 +925,7 @@ def process_fixed_asset(d): "Asset", { "item_code": d.item_code, - "purchase_receipt": d.parent, + "purchase_receipt": d.purchase_receipt, "status": ("not in", ["Draft", "Scrapped", "Sold", "Capitalized"]), }, ["name as asset", "asset_name", "company"], From 073d06c44f25591162662b44db867f065b3c2502 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 16 May 2025 15:08:16 +0530 Subject: [PATCH 2/2] fix: removed invalid child param to prevent callback failure (cherry picked from commit 1ca51e4f1453c462a943126e1bc22c0ff36ff967) --- .../assets/doctype/asset_capitalization/asset_capitalization.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js index 848a31c4dfa..2afc1ecb439 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js @@ -281,7 +281,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s if (me.frm.doc.target_item_code) { return me.frm.call({ method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_item_details", - child: me.frm.doc, args: { item_code: me.frm.doc.target_item_code, company: me.frm.doc.company, @@ -301,7 +300,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s if (me.frm.doc.target_asset) { return me.frm.call({ method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_asset_details", - child: me.frm.doc, args: { asset: me.frm.doc.target_asset, company: me.frm.doc.company,