Merge PR #554 into 17.0

Signed-off-by alexis-via
OCA · Jun 14, 2024 · 7318b70 · 7318b70
2 parents 0e589ce + 41ad0b1
commit 7318b70
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 79 deletions.
diff --git a/l10n_fr_das2/__init__.py b/l10n_fr_das2/__init__.py
@@ -1,2 +1 @@
 from . import models
-from . import wizards
diff --git a/l10n_fr_das2/__manifest__.py b/l10n_fr_das2/__manifest__.py
@@ -16,14 +16,13 @@
         "l10n_fr_cog",
     ],
     "external_dependencies": {
-        "python": ["stdnum", "pyfrdas2"],
+        "python": ["stdnum", "pyfrdas2>=0.4"],
     },
     "data": [
         "security/das2_security.xml",
         "security/ir.model.access.csv",
         "views/l10n_fr_das2.xml",
         "views/res_partner.xml",
-        "views/res_config_settings.xml",
     ],
     "demo": ["demo/demo.xml"],
     "installable": True,

diff --git a/l10n_fr_das2/models/__init__.py b/l10n_fr_das2/models/__init__.py
@@ -1,3 +1,2 @@
 from . import l10n_fr_das2
 from . import res_partner
-from . import res_company
diff --git a/l10n_fr_das2/models/l10n_fr_das2.py b/l10n_fr_das2/models/l10n_fr_das2.py
@@ -7,7 +7,11 @@
 from datetime import datetime
 
 from markupsafe import Markup
-from pyfrdas2 import format_street_block, generate_file
+from pyfrdas2 import (
+    format_street_block,
+    generate_file,
+    get_partner_declaration_threshold,
+)
 from stdnum.fr.siret import is_valid
 
 from odoo import _, api, fields, models, tools
@@ -240,15 +244,9 @@ def generate_lines(self):
                     currency=company.currency_id.name,
                 )
             )
-        if company.fr_das2_partner_declare_threshold <= 0:
-            raise UserError(
-                _(
-                    "The DAS2 partner declaration threshold is not set on "
-                    "company '%s'."
-                )
-                % company.display_name
-            )
-        self.partner_declare_threshold = company.fr_das2_partner_declare_threshold
+        self.write(
+            {"partner_declare_threshold": get_partner_declaration_threshold(self.year)}
+        )
         das2_partners = self.env["res.partner"].search(
             [("parent_id", "=", False), ("fr_das2_type", "!=", False)]
         )

diff --git a/l10n_fr_das2/models/res_company.py b/l10n_fr_das2/models/res_company.py
diff --git a/l10n_fr_das2/views/res_config_settings.xml b/l10n_fr_das2/views/res_config_settings.xml
diff --git a/l10n_fr_das2/wizards/__init__.py b/l10n_fr_das2/wizards/__init__.py
diff --git a/l10n_fr_das2/wizards/res_config_settings.py b/l10n_fr_das2/wizards/res_config_settings.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 # generated from manifests external_dependencies
-pyfrdas2
+pyfrdas2>=0.4
 python-stdnum
 python-stdnum>=1.18
 requests_oauthlib