Skip to content

Commit 70bfd44

Browse files
committed
Merge PR #1082 into 15.0
Signed-off-by pedrobaeza
2 parents 4dac712 + d9a706a commit 70bfd44

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

account_invoice_facturx/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"base_facturx",
1818
"base_vat",
1919
],
20-
"external_dependencies": {"python": ["factur-x"]},
20+
"external_dependencies": {"python": ["factur-x<=3.1"]},
2121
"data": [
2222
"views/res_partner.xml",
2323
"views/res_config_settings.xml",

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# generated from manifests external_dependencies
2-
factur-x
2+
factur-x<=3.1
33
pypdf
44
PyPDF2
55
PyYAML

test_base_import_pdf_by_template/demo/base_import_pdf_template.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -254,15 +254,17 @@
254254
<field name="related_model">lines</field>
255255
<field name="field_id" ref="account.field_account_move_line__quantity" />
256256
<field name="column">1</field>
257-
<field name="pattern">(^\d{1,3}\n)[0-9]{1,2}</field>
257+
<field name="pattern">\[[A-Z\d]+[_|-][A-Z\d]+\] [a-zA-Záí]* ([0-9]{1,3})</field>
258258
<field name="value_type">variable</field>
259259
</record>
260260
<record id="invoice_tecnativa_price_unit" model="base.import.pdf.template.line">
261261
<field name="template_id" ref="invoice_tecnativa" />
262262
<field name="related_model">lines</field>
263263
<field name="field_id" ref="account.field_account_move_line__price_unit" />
264264
<field name="column">2</field>
265-
<field name="pattern">(^\d{1,3}\.(?!00)\d{2}\n)</field>
265+
<field
266+
name="pattern"
267+
>\[[A-Z\d]+[_|-][A-Z\d]+\] [a-zA-Záí]* [0-9]{1,3} ([0-9]{1,3}.[0-9]{2})</field>
266268
<field name="value_type">variable</field>
267269
<field name="log_distinct_value" eval="True" />
268270
</record>

0 commit comments

Comments
 (0)