From 4ec5b28fd27a56a238d27273642581a8f0742b97 Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Wed, 8 Oct 2025 08:43:42 +0530 Subject: [PATCH 1/2] fix(asset movement): clear custodian if not present (cherry picked from commit 323d8eaccdb213e12cdbdbde3fe8e8b24323c4ea) # Conflicts: # erpnext/assets/doctype/asset_movement/asset_movement.py --- erpnext/assets/doctype/asset_movement/asset_movement.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py index cfe9768ef4b..e1a1ce0871e 100644 --- a/erpnext/assets/doctype/asset_movement/asset_movement.py +++ b/erpnext/assets/doctype/asset_movement/asset_movement.py @@ -5,7 +5,7 @@ import frappe from frappe import _ from frappe.model.document import Document -from frappe.utils import get_link_to_form +from frappe.utils import cstr, get_link_to_form from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity @@ -142,6 +142,7 @@ class AssetMovement(Document): def update_asset_location_and_custodian(self, asset_id, location, employee): asset = frappe.get_doc("Asset", asset_id) +<<<<<<< HEAD updates = {} if employee and employee != asset.custodian: updates["custodian"] = employee @@ -149,6 +150,10 @@ class AssetMovement(Document): elif not employee and asset.custodian: updates["custodian"] = "" +======= + if cstr(employee) != asset.custodian: + frappe.db.set_value("Asset", asset_id, "custodian", cstr(employee)) +>>>>>>> 323d8eaccd (fix(asset movement): clear custodian if not present) if location and location != asset.location: updates["location"] = location From 38e1ca13627a5a922d9df96335df1eedbee628a0 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 8 Oct 2025 12:53:25 +0530 Subject: [PATCH 2/2] fix: resolve conflict --- .../doctype/asset_movement/asset_movement.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py index e1a1ce0871e..44aa271846c 100644 --- a/erpnext/assets/doctype/asset_movement/asset_movement.py +++ b/erpnext/assets/doctype/asset_movement/asset_movement.py @@ -142,23 +142,10 @@ class AssetMovement(Document): def update_asset_location_and_custodian(self, asset_id, location, employee): asset = frappe.get_doc("Asset", asset_id) -<<<<<<< HEAD - updates = {} - if employee and employee != asset.custodian: - updates["custodian"] = employee - - elif not employee and asset.custodian: - updates["custodian"] = "" - -======= if cstr(employee) != asset.custodian: frappe.db.set_value("Asset", asset_id, "custodian", cstr(employee)) ->>>>>>> 323d8eaccd (fix(asset movement): clear custodian if not present) if location and location != asset.location: - updates["location"] = location - - if updates: - frappe.db.set_value("Asset", asset_id, updates) + frappe.db.set_value("Asset", asset_id, "location", location) def log_asset_activity(self, asset_id, location, employee): if location and employee: