(cherry picked from commit 77b044f1a6e7273b21ce5a884429875b10d3bb2e) # Conflicts: # erpnext/public/js/controllers/transaction.js
(cherry picked from commit 77b044f1a6e7273b21ce5a884429875b10d3bb2e) # Conflicts: # erpnext/public/js/controllers/transaction.js