From 02c852375d9361cd3a2f1c5229bb33c6b2daa2e0 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 18 Dec 2025 17:34:31 +0530 Subject: [PATCH] fix: add server side validation (cherry picked from commit e04353fc3103d75fffc884b87aac85d54e54757a) # Conflicts: # erpnext/assets/doctype/asset/asset.py --- erpnext/assets/doctype/asset/asset.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 33c6604f01f..9c791548e84 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -155,9 +155,15 @@ class Asset(AccountsController): self.validate_expected_value_after_useful_life() self.set_total_booked_depreciations() +<<<<<<< HEAD def before_save(self): self.total_asset_cost = self.gross_purchase_amount + self.additional_asset_cost 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.")) +>>>>>>> e04353fc31 (fix: add server side validation) def on_submit(self): self.validate_in_use_date()