From 53705252ea43289d9d5f40f4f3556079bcd26a0d Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 18 Dec 2025 17:15:10 +0530 Subject: [PATCH] fix: set frm.has_active_capitalization before using it (cherry picked from commit e2ac7646e67f14637ca0b10bade686af4ab617a7) # Conflicts: # erpnext/assets/doctype/asset/asset.js --- erpnext/assets/doctype/asset/asset.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 96ab1df0070..c058dae3ac1 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -206,6 +206,8 @@ frappe.ui.form.on("Asset", { asset: frm.doc.name, }, callback: function (r) { + frm.has_active_capitalization = r.message; + if (!r.message) { $(".form-message").text(__("Capitalize this asset before submitting.")); @@ -478,8 +480,12 @@ frappe.ui.form.on("Asset", { is_composite_asset: function (frm) { if (frm.doc.is_composite_asset) { +<<<<<<< HEAD frm.set_value("gross_purchase_amount", 0); frm.set_df_property("gross_purchase_amount", "read_only", 1); +======= + frm.set_value("net_purchase_amount", 0); +>>>>>>> e2ac7646e6 (fix: set frm.has_active_capitalization before using it) } else { frm.set_df_property("gross_purchase_amount", "read_only", 0); }