mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-17 22:05:10 +00:00
(cherry picked from commit de9c8fc9d6)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
# erpnext/setup/doctype/company/company.json