mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-20 18:54:55 +00:00
(cherry picked from commit 20c2cb40d1)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
# erpnext/patches.txt
(cherry picked from commit 20c2cb40d1)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
# erpnext/patches.txt