Merge PR #1082 into 15.0

Signed-off-by pedrobaeza
OCA · Dec 4, 2024 · 70bfd44 · 70bfd44
2 parents 4dac712 + d9a706a
commit 70bfd44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 # generated from manifests external_dependencies
-factur-x
+factur-x<=3.1
 pypdf
 PyPDF2
 PyYAML
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
@@ -254,15 +254,17 @@
         <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">
         <field name="template_id" ref="invoice_tecnativa" />
         <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>