mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-16 03:29:16 +00:00
(cherry picked from commit d65cb56d66)
# Conflicts:
# erpnext/controllers/stock_controller.py
(cherry picked from commit d65cb56d66)
# Conflicts:
# erpnext/controllers/stock_controller.py