Merge PR #78 into 12.0

Signed-off-by legalsylvain
grap · Nov 18, 2024 · 4eaf761 · 4eaf761
2 parents 1a6dcc6 + 418d4ac
commit 4eaf761
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/grap_account_invoice_invoice2data_templates/templates/ecodis_2.yml b/grap_account_invoice_invoice2data_templates/templates/ecodis_2.yml
@@ -62,4 +62,4 @@ options:
 
     # Move product name of the second line in the first line,
     # and remove useless EAN code
-    - ['EAN +: +\d+ +(?P<price_unit>\d+\.\d+) +((?P<discount>-\d+(\.\d+)?%) +)?(?P<net_price_unit>\d+\.\d+) +(?P<price_subtotal>\d+\.\d+) +(?P<vat_code>\d+\.\d+)\s+(?P<product_name>.*)', '\g<product_name>    \g<price_unit>    \g<discount>    \g<net_price_unit>    \g<price_subtotal>    \g<vat_code>']
+    - ['EAN +:( +\d+)? +(?P<price_unit>\d+\.\d+) +((?P<discount>-\d+(\.\d+)?%) +)?(?P<net_price_unit>\d+\.\d+) +(?P<price_subtotal>\d+\.\d+) +(?P<vat_code>\d+\.\d+)\s+(?P<product_name>.*)', '\g<product_name>    \g<price_unit>    \g<discount>    \g<net_price_unit>    \g<price_subtotal>    \g<vat_code>']
diff --git a/...voice_invoice2data_templates/tests/invoices/ecodis__2024-10-10__CHE__387499.pdf.encrypted b/...voice_invoice2data_templates/tests/invoices/ecodis__2024-10-10__CHE__387499.pdf.encrypted
diff --git a/grap_account_invoice_invoice2data_templates/tests/test_ecodis_2.py b/grap_account_invoice_invoice2data_templates/tests/test_ecodis_2.py
@@ -97,3 +97,30 @@ def test_ecodis_2_03(self):
                 },
             ],
         )
+
+    def test_ecodis_2_04(self):
+        self._test_supplier_template(
+            "ecodis__2024-10-10__CHE__387499.pdf",
+            line_qty=19,
+            expected_values={
+                "issuer": "Ecodis",
+                "version": 2,
+                "date": datetime(day=10, month=10, year=2024),
+                "date_due": datetime(day=10, month=11, year=2024),
+                "invoice_number": "387499",
+                "amount_untaxed": 558.29,
+                "amount": 663.79,
+            },
+            expected_lines=[
+                {
+                    "product_code": "AE638",
+                    "product_name": "Recharges vrac souple pour brosse à dents",
+                    "vat_code": "20.00",
+                    "quantity": 2,
+                    "quantity2": 20,
+                    "price_unit": 0.67,
+                    "discount": 2.5,
+                    "price_subtotal": 26.12,
+                },
+            ],
+        )