From afaa24098d40e7b35b2c6dc257c7ce8df41e3c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Tue, 3 Dec 2024 13:04:50 +0100
Subject: [PATCH 1/2] [FIX] test_base_import_pdf_by_template: Improve pattern

Related to pypdf 5.1.0 and line breaks

https://pypdf.readthedocs.io/en/latest/meta/CHANGELOG.html
---
 .../demo/base_import_pdf_template.xml                       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test_base_import_pdf_by_template/demo/base_import_pdf_template.xml b/test_base_import_pdf_by_template/demo/base_import_pdf_template.xml
index 6c9de5ba07..a1984a9553 100644
--- a/test_base_import_pdf_by_template/demo/base_import_pdf_template.xml
+++ b/test_base_import_pdf_by_template/demo/base_import_pdf_template.xml
@@ -254,7 +254,7 @@
         <field name="related_model">lines</field>
         <field name="field_id" ref="account.field_account_move_line__quantity" />
         <field name="column">1</field>
-        <field name="pattern">(^\d{1,3}\n)[0-9]{1,2}</field>
+        <field name="pattern">\[[A-Z\d]+[_|-][A-Z\d]+\] [a-zA-Záí]* ([0-9]{1,3})</field>
         <field name="value_type">variable</field>
     </record>
     <record id="invoice_tecnativa_price_unit" model="base.import.pdf.template.line">
@@ -262,7 +262,9 @@
         <field name="related_model">lines</field>
         <field name="field_id" ref="account.field_account_move_line__price_unit" />
         <field name="column">2</field>
-        <field name="pattern">(^\d{1,3}\.(?!00)\d{2}\n)</field>
+        <field
+            name="pattern"
+        >\[[A-Z\d]+[_|-][A-Z\d]+\] [a-zA-Záí]* [0-9]{1,3} ([0-9]{1,3}.[0-9]{2})</field>
         <field name="value_type">variable</field>
         <field name="log_distinct_value" eval="True" />
     </record>

From d9a706a79ef0e8315b3bb4cf2b9308ce1451200e Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 4 Dec 2024 07:05:35 +0100
Subject: [PATCH 2/2] account_invoice_*facturx: fix factur-x lib version

Pin 3.1 to fix https://github.com/OCA/edi/issues/1084
---
 account_invoice_facturx/__manifest__.py | 2 +-
 requirements.txt                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_invoice_facturx/__manifest__.py b/account_invoice_facturx/__manifest__.py
index b88eef012a..2c2777af48 100644
--- a/account_invoice_facturx/__manifest__.py
+++ b/account_invoice_facturx/__manifest__.py
@@ -17,7 +17,7 @@
         "base_facturx",
         "base_vat",
     ],
-    "external_dependencies": {"python": ["factur-x"]},
+    "external_dependencies": {"python": ["factur-x<=3.1"]},
     "data": [
         "views/res_partner.xml",
         "views/res_config_settings.xml",
diff --git a/requirements.txt b/requirements.txt
index dfbdc0276e..a9e5f9f332 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # generated from manifests external_dependencies
-factur-x
+factur-x<=3.1
 pypdf
 PyPDF2
 PyYAML