(cherry picked from commit e371f68d66) # Conflicts: # erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
e371f68d66