(cherry picked from commit 0a95b38166e36946f89286d39081b0f529e88cb6) # Conflicts: # erpnext/accounts/doctype/bank_transaction/bank_transaction.py # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js # erpnext/accounts/doctype/sales_invoice/sales_invoice.js