From ffacf4222b0401f19a3986ff9d29d513084a6e32 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:19:31 +0530 Subject: [PATCH] fix: correct validation for depreciation posting date (cherry picked from commit da4ed90a3e2af9831b93e55607449e173241b604) --- erpnext/assets/doctype/asset/asset.js | 7 ++----- erpnext/assets/doctype/asset/asset.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index c05adf6bb86..f8fafd133ba 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -775,11 +775,8 @@ frappe.ui.form.on("Asset Finance Book", { depreciation_start_date: function (frm, cdt, cdn) { const book = locals[cdt][cdn]; - if ( - frm.doc.available_for_use_date && - book.depreciation_start_date == frm.doc.available_for_use_date - ) { - frappe.msgprint(__("Depreciation Posting Date should not be equal to Available for Use Date.")); + if (frm.doc.available_for_use_date && book.depreciation_start_date < frm.doc.available_for_use_date) { + frappe.msgprint(__("Depreciation Posting Date cannot be before Available-for-use Date")); book.depreciation_start_date = ""; frm.refresh_field("finance_books"); } diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index e69fb728520..bc10ca80e8b 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -267,10 +267,10 @@ class Asset(AccountsController): frappe.throw(_("Available for use date is required")) for d in self.finance_books: - if d.depreciation_start_date == self.available_for_use_date: + if getdate(d.depreciation_start_date) < getdate(self.available_for_use_date): frappe.throw( _( - "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date." + "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date" ).format(d.idx), title=_("Incorrect Date"), )