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

fix: set frm.has_active_capitalization before using it

Browse Source 
(cherry picked from commit e2ac7646e6)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.js
This commit is contained in:
khushi8112
2025-12-18 17:15:10 +05:30
committed by Mergify
parent 569571c135
commit 53705252ea
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/assets/doctype/asset/asset.js
View File

@@ -206,6 +206,8 @@ frappe.ui.form.on("Asset", {
asset: frm.doc.name, asset: frm.doc.name,
}, },
callback: function (r) { callback: function (r) {
frm.has_active_capitalization = r.message;
if (!r.message) { if (!r.message) {
$(".form-message").text(__("Capitalize this asset before submitting.")); $(".form-message").text(__("Capitalize this asset before submitting."));
@@ -478,8 +480,12 @@ frappe.ui.form.on("Asset", {
is_composite_asset: function (frm) { is_composite_asset: function (frm) {
if (frm.doc.is_composite_asset) { if (frm.doc.is_composite_asset) {
<<<<<<< HEAD
frm.set_value("gross_purchase_amount", 0); frm.set_value("gross_purchase_amount", 0);
frm.set_df_property("gross_purchase_amount", "read_only", 1); 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 { } else {
frm.set_df_property("gross_purchase_amount", "read_only", 0); frm.set_df_property("gross_purchase_amount", "read_only", 0);
} }