nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-28 11:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49956 from frappe/mergify/bp/version-15-hotfix/pr-49954

Browse Source 
fix(asset movement): clear custodian if not present (backport #49954)
This commit is contained in:
Khushi Rawat
2025-10-08 21:33:20 +05:30
committed by GitHub
parent fda021430d 38e1ca1362
commit 5d9c245ddd
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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,18 +142,10 @@ class AssetMovement(Document):
def update_asset_location_and_custodian(self, asset_id, location, employee):
asset = frappe.get_doc("Asset", asset_id)
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))
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: