Merge branch 'new_invoice_fix' of https://github.com/hrwx/erpnext into new_invoice_fix