(cherry picked from commit 3f376cc3a5)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
(cherry picked from commit 3f376cc3a5)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js