mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 07:29:22 +00:00
(cherry picked from commit 63a7142b9b)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/accounts_settings/accounts_settings.py
# erpnext/patches.txt