a5d19955d1
Conflicts: accounts/doctype/sales_invoice/sales_invoice.txt stock/doctype/item/item.txt
Conflicts: accounts/doctype/sales_invoice/sales_invoice.txt stock/doctype/item/item.txt