From c8777d56250f847f1bf6886b799f645513f1326d Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:02:01 +0530 Subject: [PATCH 1/3] fix: reset location only if there is value in row item location field --- erpnext/assets/doctype/asset/asset.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index c00aec8a1b..ab0abdf5be 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -665,6 +665,18 @@ frappe.ui.form.on("Asset", { frm.set_value("purchase_amount", data.gross_purchase_amount); frm.set_value("asset_quantity", data.asset_quantity); frm.set_value("cost_center", data.cost_center); +<<<<<<< HEAD +======= + if (data.asset_location) { + frm.set_value("location", data.asset_location); + } + + if (doctype === "Purchase Receipt") { + frm.set_value("purchase_receipt_item", data.purchase_receipt_item); + } else { + frm.set_value("purchase_invoice_item", data.purchase_invoice_item); + } +>>>>>>> 89ec48f5b2 (fix: reset location only if there is value in row item location field) if (doctype === "Purchase Receipt") { frm.set_value("purchase_receipt_item", data.purchase_receipt_item); -- GitLab From 1444d80967cf76f1b727db9af43e976b4ed7ba24 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Fri, 21 Feb 2025 15:15:45 +0100 Subject: [PATCH 2/3] fix: merge conflict --- erpnext/assets/doctype/asset/asset.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index ab0abdf5be..cc92139ca5 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -665,8 +665,6 @@ frappe.ui.form.on("Asset", { frm.set_value("purchase_amount", data.gross_purchase_amount); frm.set_value("asset_quantity", data.asset_quantity); frm.set_value("cost_center", data.cost_center); -<<<<<<< HEAD -======= if (data.asset_location) { frm.set_value("location", data.asset_location); } @@ -676,7 +674,6 @@ frappe.ui.form.on("Asset", { } else { frm.set_value("purchase_invoice_item", data.purchase_invoice_item); } ->>>>>>> 89ec48f5b2 (fix: reset location only if there is value in row item location field) if (doctype === "Purchase Receipt") { frm.set_value("purchase_receipt_item", data.purchase_receipt_item); -- GitLab From 429fb11e57a35f04e968b736195c48296a21e2f5 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Fri, 21 Feb 2025 15:17:26 +0100 Subject: [PATCH 3/3] fix: duplicate logic --- erpnext/assets/doctype/asset/asset.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index cc92139ca5..0a017ac158 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -675,12 +675,6 @@ frappe.ui.form.on("Asset", { frm.set_value("purchase_invoice_item", data.purchase_invoice_item); } - if (doctype === "Purchase Receipt") { - frm.set_value("purchase_receipt_item", data.purchase_receipt_item); - } else { - frm.set_value("purchase_invoice_item", data.purchase_invoice_item); - } - let is_editable = !data.is_multiple_items; // if multiple items, then fields should be read-only frm.set_df_property("gross_purchase_amount", "read_only", is_editable); frm.set_df_property("asset_quantity", "read_only", is_editable); -- GitLab