Merge df1e3c6 into 42bd636

OCA · May 28, 2019 · d0c740b · d0c740b
2 parents 42bd636 + df1e3c6
commit d0c740b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/l10n_es_aeat/__manifest__.py b/l10n_es_aeat/__manifest__.py
@@ -9,7 +9,7 @@
 {
     'name': "AEAT Base",
     'summary': "Modulo base para declaraciones de la AEAT",
-    'version': "12.0.1.0.0",
+    'version': "12.0.1.0.1",
     'author': "Pexego,"
               "Acysos,"
               "AvanzOSC,"

diff --git a/l10n_es_aeat/models/l10n_es_aeat_report.py b/l10n_es_aeat/models/l10n_es_aeat_report.py
@@ -293,6 +293,33 @@ def _get_previous_fiscalyear_reports(self, date):
                  previous reports.
         """
         self.ensure_one()
+        if self.period_type in ("1T", "2T", "3T", "4T"):
+            periods = ("1T", "2T", "3T", "4T")
+        else:
+            periods = (
+                "01", "02", "03", "04", "05", "06", "07", "08", "09", "10",
+                "11", "12",)
+        search_periods = self.search([
+            ("year", "=", self.year),
+            ("period_type", "in", periods),
+            ("state", "not in", ("draft", "cancelled")),
+            ("type", "=", "N"),
+        ], order="period_type")
+        search_periods |= self
+        search_periods = search_periods.sorted(key=lambda r: r.period_type)
+        if search_periods and len(search_periods) != len(
+                set(search_periods.mapped("period_type"))):
+            # Periodos repetidos
+            raise exceptions.UserError(
+                _("Already exist a report with same date period"))
+        elif len(search_periods) > 1:
+            # Periodos anteriores que deberían estar
+            pos = periods.index(self.period_type)
+            period_filter = periods[:pos]
+            if not set(period_filter).issubset(
+                    search_periods.mapped("period_type")):
+                raise exceptions.UserError(
+                    _("There are missing reports from earlier periods"))
         return self.search([
             ('year', '=', self.year),
             ('date_start', '<', date),

diff --git a/l10n_es_aeat/readme/CONTRIBUTORS.rst b/l10n_es_aeat/readme/CONTRIBUTORS.rst
@@ -8,3 +8,4 @@
 * Antonio Espinosa <antonio.espinosa@tecnativa.com>
 * Juan Vicente Pascual <jvpascual@puntsistemes.es>
 * Abraham Anes <abraham@studio73.es>
+* Isaac Gallart <igallart@puntsistemes.es>