mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-31 23:33:43 +00:00
(cherry picked from commit a87e7fde03)
# Conflicts:
# erpnext/accounts/utils.py
# erpnext/templates/pages/order.html
(cherry picked from commit a87e7fde03)
# Conflicts:
# erpnext/accounts/utils.py
# erpnext/templates/pages/order.html