mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-13 20:05:09 +00:00
(cherry picked from commit 33d03b1542)
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order.json
(cherry picked from commit 33d03b1542)
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order.json