(cherry picked from commit de9c8fc9d6)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
# erpnext/setup/doctype/company/company.json
(cherry picked from commit de9c8fc9d6)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
# erpnext/setup/doctype/company/company.json