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

Merge pull request #47573 from khushi8112/asset-capitalization-child-table-row-deletion

Browse Source 
fix: alias 'name' and 'parent' to prevent child row mapping issues
This commit is contained in:
Khushi Rawat
2025-05-16 15:34:28 +05:30
committed by GitHub
parent 7f9f3027cc 1ca51e4f14
commit 7bc974b65a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
View File

@@ -281,7 +281,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
if (me.frm.doc.target_item_code) { if (me.frm.doc.target_item_code) {
return me.frm.call({ return me.frm.call({
method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_item_details", method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_item_details",
child: me.frm.doc,
args: { args: {
item_code: me.frm.doc.target_item_code, item_code: me.frm.doc.target_item_code,
company: me.frm.doc.company, company: me.frm.doc.company,
@@ -301,7 +300,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
if (me.frm.doc.target_asset) { if (me.frm.doc.target_asset) {
return me.frm.call({ return me.frm.call({
method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_asset_details", method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_asset_details",
child: me.frm.doc,
args: { args: {
asset: me.frm.doc.target_asset, asset: me.frm.doc.target_asset,
company: me.frm.doc.company, company: me.frm.doc.company,

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

@@ -871,8 +871,8 @@ def get_items_tagged_to_wip_composite_asset(params):
"valuation_rate", "valuation_rate",
"amount", "amount",
"is_fixed_asset", "is_fixed_asset",
"parent", "parent as purchase_receipt",
"name", "name as purchase_receipt_item",
] ]
pr_items = frappe.get_all( pr_items = frappe.get_all(
@@ -901,7 +901,7 @@ def process_stock_item(d):
stock_capitalized = frappe.db.exists( stock_capitalized = frappe.db.exists(
"Asset Capitalization Stock Item", "Asset Capitalization Stock Item",
{ {
"purchase_receipt_item": d.name, "purchase_receipt_item": d.purchase_receipt_item,
"parentfield": "stock_items", "parentfield": "stock_items",
"parenttype": "Asset Capitalization", "parenttype": "Asset Capitalization",
"docstatus": 1, "docstatus": 1,
@@ -912,7 +912,7 @@ def process_stock_item(d):
return None return None
stock_item_data = frappe._dict(d) 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 return stock_item_data
@@ -921,7 +921,7 @@ def process_fixed_asset(d):
"Asset", "Asset",
{ {
"item_code": d.item_code, "item_code": d.item_code,
"purchase_receipt": d.parent, "purchase_receipt": d.purchase_receipt,
"status": ("not in", ["Draft", "Scrapped", "Sold", "Capitalized"]), "status": ("not in", ["Draft", "Scrapped", "Sold", "Capitalized"]),
}, },
["name as asset", "asset_name", "company"], ["name as asset", "asset_name", "company"],