mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-20 17:59:57 +00:00
(cherry picked from commit ba936eefab)
# Conflicts:
# erpnext/accounts/doctype/pos_profile/pos_profile.py
# erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
# erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
# erpnext/setup/doctype/employee/employee.py
# erpnext/support/doctype/issue/issue.py