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

fix: do not hide primary-action for composite asset

Browse Source
This commit is contained in:
khushi8112
2025-12-18 16:43:26 +05:30
parent e53a74f2be
commit 482efee6c0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,12 @@ frappe.ui.form.on("Asset", {
} }
}, },
before_submit: function (frm) {
if (frm.doc.is_composite_asset && !frm.has_active_capitalization) {
frappe.throw(__("Please capitalize this asset before submitting."));
}
},
refresh: function (frm) { refresh: function (frm) {
frappe.ui.form.trigger("Asset", "is_existing_asset"); frappe.ui.form.trigger("Asset", "is_existing_asset");
frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1); frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
@@ -197,8 +203,7 @@ frappe.ui.form.on("Asset", {
}, },
callback: function (r) { callback: function (r) {
if (!r.message) { if (!r.message) {
$(".primary-action").prop("hidden", true); $(".form-message").text(__("Capitalize this asset before submitting."));
$(".form-message").text(__("Capitalize this asset to confirm"));
frm.add_custom_button(__("Capitalize Asset"), function () { frm.add_custom_button(__("Capitalize Asset"), function () {
frm.trigger("create_asset_capitalization"); frm.trigger("create_asset_capitalization");
@@ -538,7 +543,6 @@ frappe.ui.form.on("Asset", {
callback: function (r) { callback: function (r) {
var doclist = frappe.model.sync(r.message); var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name); frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
$(".primary-action").prop("hidden", false);
}, },
}); });
}, },

5
erpnext/assets/doctype/asset/asset.json
View File

@@ -556,7 +556,8 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Net Purchase Amount", "label": "Net Purchase Amount",
"mandatory_depends_on": "eval:(!doc.is_composite_asset || doc.docstatus==1)", "mandatory_depends_on": "eval:(!doc.is_composite_asset || doc.docstatus==1)",
"options": "Company:company:default_currency" "options": "Company:company:default_currency",
"read_only_depends_on": "eval: doc.is_composite_asset"
} }
], ],
"idx": 72, "idx": 72,
@@ -600,7 +601,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
"modified": "2025-11-04 22:39:00.817405", "modified": "2025-12-18 16:36:40.904246",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",