CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +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-23 16:02:50 +05:30
parent f318a3658d
commit cbcfe6ec36
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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);
@@ -200,9 +206,10 @@ 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) {
$(".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");
@@ -474,7 +481,6 @@ 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) {
frm.set_value("gross_purchase_amount", 0); frm.set_value("gross_purchase_amount", 0);
frm.set_df_property("gross_purchase_amount", "read_only", 1);
} else { } else {
frm.set_df_property("gross_purchase_amount", "read_only", 0); frm.set_df_property("gross_purchase_amount", "read_only", 0);
} }
@@ -542,7 +548,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

@@ -229,7 +229,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"
}, },
{ {
"fieldname": "available_for_use_date", "fieldname": "available_for_use_date",
@@ -596,7 +597,7 @@
"link_fieldname": "target_asset" "link_fieldname": "target_asset"
} }
], ],
"modified": "2025-11-17 18:01:51.417942", "modified": "2025-12-23 16:01:10.195932",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",

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

@@ -69,7 +69,6 @@ class Asset(AccountsController):
default_finance_book: DF.Link | None default_finance_book: DF.Link | None
department: DF.Link | None department: DF.Link | None
depr_entry_posting_status: DF.Literal["", "Successful", "Failed"] depr_entry_posting_status: DF.Literal["", "Successful", "Failed"]
depreciation_completed: DF.Check
depreciation_method: DF.Literal["", "Straight Line", "Double Declining Balance", "Manual"] depreciation_method: DF.Literal["", "Straight Line", "Double Declining Balance", "Manual"]
disposal_date: DF.Date | None disposal_date: DF.Date | None
finance_books: DF.Table[AssetFinanceBook] finance_books: DF.Table[AssetFinanceBook]
@@ -159,6 +158,10 @@ class Asset(AccountsController):
self.total_asset_cost = self.gross_purchase_amount + self.additional_asset_cost self.total_asset_cost = self.gross_purchase_amount + self.additional_asset_cost
self.status = self.get_status() self.status = self.get_status()
def before_submit(self):
if self.is_composite_asset and not has_active_capitalization(self.name):
frappe.throw(_("Please capitalize this asset before submitting."))
def on_submit(self): def on_submit(self):
self.validate_in_use_date() self.validate_in_use_date()
self.make_asset_movement() self.make_asset_movement()