[MIG] account_fiscal_year_closing: Migration to 18.0

Author: Borruso

account_fiscal_year_closing/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Fiscal year closing",
     "summary": "Generic fiscal year closing wizard",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Accounting & Finance",
     "website": "https://github.com/OCA/account-closing",
     "author": "Odoo Community Association (OCA)",

account_fiscal_year_closing/migrations/16.0.1.0.0/noupdate_changes.xml

@@ -4,7 +4,7 @@
 
 from dateutil.relativedelta import relativedelta
 
-from odoo import _, api, exceptions, fields, models
+from odoo import api, exceptions, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import float_is_zero
 
@@ -32,28 +32,22 @@ def _default_company_id(self):
 
     name = fields.Char(
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     check_draft_moves = fields.Boolean(
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     year = fields.Integer(
         help="Introduce here the year to close. If the fiscal year is between "
         "several natural years, you have to put here the last one.",
         default=lambda self: self._default_year(),
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     company_id = fields.Many2one(
         default=lambda self: self._default_company_id(),
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
-    chart_template_id = fields.Many2one(
-        comodel_name="account.chart.template",
-        string="Chart template",
-        related="company_id.chart_template_id",
+    chart_template = fields.Selection(
+        related="company_id.chart_template",
         readonly=True,
     )
     state = fields.Selection(
@@ -74,33 +68,28 @@ def _default_company_id(self):
         string="From date",
         required=True,
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     date_end = fields.Date(
         string="To date",
         required=True,
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     date_opening = fields.Date(
         string="Opening date",
         required=True,
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     closing_template_id = fields.Many2one(
         comodel_name="account.fiscalyear.closing.template",
         string="Closing template",
-        domain="[('chart_template_ids', '=', chart_template_id)]",
+        domain="[('chart_template', '=', chart_template)]",
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     move_config_ids = fields.One2many(
         comodel_name="account.fiscalyear.closing.config",
         inverse_name="fyc_id",
         string="Moves configuration",
         readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     move_ids = fields.One2many(
         comodel_name="account.move",
@@ -113,7 +102,7 @@ def _default_company_id(self):
         (
             "year_company_uniq",
             "unique(year, company_id)",
-            _(
+            (
                 "There should be only one fiscal year closing for that year and "
                 "company!"
             ),
@@ -135,7 +124,7 @@ def _prepare_mapping(self, tmpl_mapping):
             )
             # Use an error name if no destination account found
             if not dest_account:
-                name = _("No destination account '%s' found.") % (
+                name = self.env._("No destination account '%s' found.") % (
                     tmpl_mapping.dest_account,
                 )
         return {
@@ -233,9 +222,12 @@ def draft_moves_check(self):
                 ]
             )
             if draft_moves:
-                msg = _("One or more draft moves found: \n")
+                msg = closing.env._("One or more draft moves found: \n")
                 for move in draft_moves:
-                    msg += f"ID: {move.id}, Date: {move.date}, Number: {move.name}, Ref: {move.ref}\n"
+                    msg += (
+                        f"ID: {move.id}, Date: {move.date}"
+                        f", Number: {move.name}, Ref: {move.ref}\n"
+                    )
                 raise ValidationError(msg)
         return True
 
@@ -252,7 +244,7 @@ def _show_unbalanced_move_wizard(self, data):
         wizard = self.env["account.fiscalyear.closing.unbalanced.move"].create(data)
         return {
             "type": "ir.actions.act_window",
-            "name": _("Unbalanced journal entry found"),
+            "name": self.env._("Unbalanced journal entry found"),
             "view_type": "form",
             "view_mode": "form",
             "res_model": "account.fiscalyear.closing.unbalanced.move",
@@ -311,20 +303,20 @@ def button_post(self):
     def button_open_moves(self):
         # Return an action for showing moves
         return {
-            "name": _("Fiscal closing moves"),
+            "name": self.env._("Fiscal closing moves"),
             "type": "ir.actions.act_window",
             "view_type": "form",
-            "view_mode": "tree,form",
+            "view_mode": "list,form",
             "res_model": "account.move",
             "domain": [("fyc_id", "in", self.ids)],
         }
 
     def button_open_move_lines(self):
         return {
-            "name": _("Fiscal closing move lines"),
+            "name": self.env._("Fiscal closing move lines"),
             "type": "ir.actions.act_window",
             "view_type": "form",
-            "view_mode": "tree,form",
+            "view_mode": "list,form",
             "res_model": "account.move.line",
             "domain": [("move_id.fyc_id", "in", self.ids)],
         }
@@ -346,12 +338,12 @@ def button_recover(self):
     def unlink(self):
         if any(x.state not in ("draft", "cancelled") for x in self):
             raise exceptions.UserError(
-                _(
+                self.env._(
                     "You can't remove any closing that is not in draft or "
                     "cancelled state."
                 )
             )
-        return super(AccountFiscalyearClosing, self).unlink()
+        return super().unlink()
 
 
 class AccountFiscalyearClosingConfig(models.Model):
@@ -387,7 +379,7 @@ class AccountFiscalyearClosingConfig(models.Model):
         (
             "code_uniq",
             "unique(code, fyc_id)",
-            _("Code must be unique per fiscal year closing!"),
+            "Code must be unique per fiscal year closing!",
         ),
     ]
 
@@ -436,7 +428,7 @@ def _mapping_move_lines_get(self):
             dest_totals.setdefault(dest, 0)
             src_accounts = self.env["account.account"].search(
                 [
-                    ("company_id", "=", self.fyc_id.company_id.id),
+                    ("company_ids", "in", self.fyc_id.company_id.ids),
                     ("code", "=ilike", account_map.src_accounts),
                 ],
                 order="code ASC",
@@ -550,15 +542,15 @@ def create(self, vals_list):
                 vals["dest_account_id"], list
             ):
                 vals["dest_account_id"] = vals["dest_account_id"][0]
-        res = super(AccountFiscalyearClosingMapping, self).create(vals_list)
+        res = super().create(vals_list)
         return res
 
     def write(self, vals):
         if vals.get("dest_account_id", False) and isinstance(
             vals["dest_account_id"], list
         ):
             vals["dest_account_id"] = vals["dest_account_id"][0]
-        res = super(AccountFiscalyearClosingMapping, self).write(vals)
+        res = super().write(vals)
         return res
 
     def dest_move_line_prepare(self, dest, balance, partner_id=False):
@@ -573,7 +565,7 @@ def dest_move_line_prepare(self, dest, balance, partner_id=False):
                 "account_id": dest.id,
                 "debit": balance < 0 and -balance,
                 "credit": balance > 0 and balance,
-                "name": _("Result"),
+                "name": self.env._("Result"),
                 "date": date,
                 "partner_id": partner_id,
             }

account_fiscal_year_closing/migrations/16.0.1.0.0/post-migration.py

@@ -14,9 +14,11 @@ class AccountFiscalyearClosingTemplate(models.Model):
         inverse_name="template_id",
         string="Moves configuration",
     )
-    chart_template_ids = fields.Many2many(
-        comodel_name="account.chart.template",
+    chart_template = fields.Selection(
         string="Available for",
+        selection=lambda self: self.env[
+            "account.chart.template"
+        ]._select_chart_template(),
         required=True,
     )
 

account_fiscal_year_closing/migrations/16.0.1.0.0/pre-migration.py

@@ -1,6 +1,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class AccountMove(models.Model):
@@ -15,7 +15,7 @@ def _selection_closing_type(self):
                 allfields=["move_type"]
             )["move_type"]["selection"]
         )
-        res.append(("none", _("None")))
+        res.append(("none", self.env._("None")))
         return res
 
     fyc_id = fields.Many2one(
@@ -27,5 +27,4 @@ def _selection_closing_type(self):
     closing_type = fields.Selection(
         selection=_selection_closing_type,
         default="none",
-        states={"posted": [("readonly", True)]},
     )

account_fiscal_year_closing/models/account_fiscalyear_closing.py

@@ -10,7 +10,7 @@
 from odoo.addons.account.tests.common import AccountTestInvoicingCommon
 
 
-@tagged("post_install")
+@tagged("post_install_l10n", "post_install", "-at_install")
 class TestAccountFiscalYearClosing(AccountTestInvoicingCommon):
     @classmethod
     def setUpClass(cls, chart_template_ref=None):
@@ -105,16 +105,18 @@ def setUpClass(cls, chart_template_ref=None):
                         {
                             "value": "percent",
                             "value_amount": 50,
-                            "days": 15,
+                            "delay_type": "days_after",
+                            "nb_days": 15,
                         },
                     ),
                     (
                         0,
                         0,
                         {
-                            "value": "balance",
-                            "days_after": 15,
-                            "end_month": True,
+                            "value": "percent",
+                            "value_amount": 50,
+                            "delay_type": "days_after_end_of_month",
+                            "nb_days": 15,
                         },
                     ),
                 ],