Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.json erpnext/stock/doctype/delivery_note/delivery_note.json