mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-17 10:36:31 +00:00
(cherry picked from commit 00057b1798)
# Conflicts:
# erpnext/controllers/selling_controller.py
(cherry picked from commit 00057b1798)
# Conflicts:
# erpnext/controllers/selling_controller.py