[FIX] account_invoice_ubl,base_ubl: backport fix from v13

This way, we avoid the issue of factur-x.

Author: MiquelRForgeFlow

account_invoice_facturx/models/account_invoice.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 try:
-    from facturx import generate_facturx_from_binary, check_facturx_xsd
+    from facturx import generate_facturx_from_binary, xml_check_xsd
 except ImportError:
     logger.debug('Cannot import facturx')
 
@@ -741,7 +741,7 @@ def generate_facturx_xml(self):
             'Factur-X XML file generated for invoice ID %d', self.id)
         logger.debug(xml_string)
         try:
-            check_facturx_xsd(xml_string, 'factur-x', facturx_level=ns['level'])
+            xml_check_xsd(xml_string, 'factur-x', level=ns['level'])
         except Exception as e:
             raise UserError(_(
                 "The factur-x.xml file is invalid against the official "

account_invoice_facturx/tests/test_facturx_invoice.py

@@ -14,7 +14,7 @@ def test_deep_customer_invoice(self):
         invoice = self.test_only_create_invoice()
         company = invoice.company_id
         if company.xml_format_in_pdf_invoice != 'factur-x':
-            company.xml_format_in_pdf_invoice = 'factur-x'
+            company.write({"xml_format_in_pdf_invoice": "factur-x"})
         inv_report = self.env.ref('account.account_invoices').with_context(
             force_report_rendering=True)
         for level in ['minimum', 'basicwl', 'basic', 'en16931', 'extended']:

account_invoice_import_facturx/wizard/account_invoice_import.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 try:
-    from facturx import check_facturx_xsd
+    from facturx import xml_check_xsd
 except ImportError:
     logger.debug('Cannot import facturx')
 
@@ -288,7 +288,7 @@ def parse_facturx_invoice(self, xml_root):
         namespaces = xml_root.nsmap
         # Check XML schema to avoid headaches trying to import invalid files
         try:
-            check_facturx_xsd(xml_root)
+            xml_check_xsd(xml_root)
         except Exception:
             raise UserError(_(
                 "The XML file embedded in the Factur-X invoice is invalid "

account_invoice_ubl/models/account_invoice.py

@@ -289,12 +289,19 @@ def get_ubl_version(self):
     def get_ubl_lang(self):
         return self.partner_id.lang or 'en_US'
 
+    def add_xml_in_pdf_buffer(self, buffer):
+        self.ensure_one()
+        if self.is_ubl_sale_invoice_posted():
+            version = self.get_ubl_version()
+            xml_filename = self.get_ubl_filename(version=version)
+            xml_string = self.generate_ubl_xml_string(version=version)
+            buffer = self._ubl_add_xml_in_pdf_buffer(xml_string, xml_filename, buffer)
+        return buffer
+
     @api.multi
     def embed_ubl_xml_in_pdf(self, pdf_content=None, pdf_file=None):
         self.ensure_one()
-        if (
-                self.type in ('out_invoice', 'out_refund') and
-                self.state in ('open', 'paid')):
+        if self.is_ubl_sale_invoice_posted():
             version = self.get_ubl_version()
             ubl_filename = self.get_ubl_filename(version=version)
             xml_string = self.generate_ubl_xml_string(version=version)
@@ -330,3 +337,11 @@ def attach_ubl_xml_file_button(self):
             'view_mode': 'form,tree'
             })
         return action
+
+    def is_ubl_sale_invoice_posted(self):
+        self.ensure_one()
+        is_ubl = self.company_id.xml_format_in_pdf_invoice == "ubl"
+        if (is_ubl and self.type in ('out_invoice', 'out_refund')
+                and self.state in ('open', 'paid')):
+            return True
+        return False

account_invoice_ubl/models/ir_actions_report.py

@@ -8,27 +8,29 @@
 class IrActionsReport(models.Model):
     _inherit = "ir.actions.report"
 
+    def postprocess_pdf_report(self, record, buffer):
+        if self.is_ubl_xml_to_embed_in_invoice():
+            buffer = record.add_xml_in_pdf_buffer(buffer)
+        return super().postprocess_pdf_report(record, buffer)
+
     @api.multi
     def _post_pdf(self, save_in_attachment, pdf_content=None, res_ids=None):
         """We go through that method when the PDF is generated for the 1st
         time and also when it is read from the attachment.
-        This method is specific to QWeb"""
-        invoice_reports = self._get_invoice_reports_ubl()
-        if (
-                len(self) == 1 and
-                self.report_name in invoice_reports and
-                res_ids and
-                len(res_ids) == 1 and
-                not self._context.get('no_embedded_ubl_xml')):
-            invoice = self.env['account.invoice'].browse(res_ids[0])
-            if (
-                    invoice.type in ('out_invoice', 'out_refund') and
-                    invoice.company_id.xml_format_in_pdf_invoice == 'ubl'):
-                pdf_content = invoice.with_context(
-                    no_embedded_pdf=True).embed_ubl_xml_in_pdf(
-                    pdf_content=pdf_content)
-        return super()._post_pdf(
+        """
+        pdf_content = super()._post_pdf(
             save_in_attachment, pdf_content=pdf_content, res_ids=res_ids)
+        if res_ids and len(res_ids) == 1:
+            if self.is_ubl_xml_to_embed_in_invoice():
+                invoice = self.env['account.invoice'].browse(res_ids)
+                if invoice.is_ubl_sale_invoice_posted():
+                    pdf_content = invoice.embed_ubl_xml_in_pdf(pdf_content)
+        return pdf_content
+
+    def is_ubl_xml_to_embed_in_invoice(self):
+        return (self.model == 'account.invoice'
+                and not self.env.context.get('no_embedded_ubl_xml')
+                and self.report_name in self._get_invoice_reports_ubl())
 
     @classmethod
     def _get_invoice_reports_ubl(cls):

base_ubl/models/ubl.py

@@ -510,6 +510,22 @@ def _ubl_check_xml_schema(self, xml_string, document, version='2.1'):
                 % str(e))
         return True
 
+    @api.model
+    def _ubl_add_xml_in_pdf_buffer(self, xml_string, xml_filename, buffer):
+        # Add attachment to PDF content.
+        reader = PdfFileReader(buffer)
+        writer = PdfFileWriter()
+        writer.appendPagesFromReader(reader)
+        writer.addAttachment(xml_filename, xml_string)
+        # show attachments when opening PDF
+        writer._root_object.update(
+            {NameObject("/PageMode"): NameObject("/UseAttachments")}
+        )
+        new_buffer = BytesIO()
+        writer.write(new_buffer)
+        buffer.close()
+        return new_buffer
+
     @api.model
     def embed_xml_in_pdf(
             self, xml_string, xml_filename, pdf_content=None, pdf_file=None):