(cherry picked from commit 17f85de6fb6fbcd26993768b9fd29822189626d2) # Conflicts: # erpnext/assets/doctype/asset/depreciation.py # erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
(cherry picked from commit 17f85de6fb6fbcd26993768b9fd29822189626d2) # Conflicts: # erpnext/assets/doctype/asset/depreciation.py # erpnext/assets/doctype/asset_capitalization/asset_capitalization.py