mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-17 00:18:39 +00:00
(cherry picked from commit 17f85de6fb)
# Conflicts:
# erpnext/assets/doctype/asset/depreciation.py
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.py