Update and rename report_invoice_extra_org.xml to report_invoice_secondary.xml