From a50956811079ca6b23e613dc8f5487b515285797 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 19 Feb 2025 15:04:26 +0530 Subject: [PATCH] fix: reset location only if there is value in row item location field (cherry picked from commit 2bb79197aabe3dd5921066d6550632b8c32ad85b) --- erpnext/assets/doctype/asset/asset.js | 1 - erpnext/assets/doctype/asset/asset.py | 8 -------- 2 files changed, 9 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index d5ebbc9df28..b9ea888faf7 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -652,7 +652,6 @@ frappe.ui.form.on("Asset", { frm.set_value("purchase_amount", data.gross_purchase_amount); frm.set_value("asset_quantity", data.asset_quantity); frm.set_value("cost_center", data.cost_center); - frm.set_value("location", data.asset_location); if (doctype === "Purchase Receipt") { frm.set_value("purchase_receipt_item", data.purchase_receipt_item); diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index d89a33f9d4e..9b3cb022bd8 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -232,14 +232,6 @@ class Asset(AccountsController): if item.base_net_rate == self.gross_purchase_amount and item.qty == self.asset_quantity: return item.name - # If no matching item found, raise validation error - frappe.throw( - _( - "No matching item found in {0} with item code {1}. " - "Please verify the purchase details and ensure the correct amount and quantity is recorded." - ).format(purchase_doc_type, self.item_code) - ) - def validate_asset_and_reference(self): if self.purchase_invoice or self.purchase_receipt: reference_doc = "Purchase Invoice" if self.purchase_invoice else "Purchase Receipt"