396628e7ea
Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/patches/patch_list.py
Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/patches/patch_list.py