CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-14 02:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(asset movement): clear custodian if not present

Browse Source 
(cherry picked from commit 323d8eaccd)

# Conflicts:
#	erpnext/assets/doctype/asset_movement/asset_movement.py
This commit is contained in:
ravibharathi656
2025-10-08 08:43:42 +05:30
committed by Mergify
parent 11eab0c852
commit 4ec5b28fd2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/assets/doctype/asset_movement/asset_movement.py
View File

@@ -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