[MIG] account_receipt_journal: Migration to 18.0

Author: rjaraspearhead

account_receipt_journal/__init__.py

@@ -2,12 +2,12 @@
 from openupgradelib import openupgrade
 
 
-def rename_old_italian_data(cr):
-    if not openupgrade.is_module_installed(cr, "l10n_it_corrispettivi"):
+def rename_old_italian_data(env):
+    if not openupgrade.is_module_installed(env.cr, "l10n_it_corrispettivi"):
         return
 
     openupgrade.rename_xmlids(
-        cr,
+        env.cr,
         [
             (
                 "l10n_it_corrispettivi.corrispettivi_journal",

account_receipt_journal/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Receipts Journals",
     "summary": "Define and use journals dedicated to receipts",
-    "version": "15.0.1.0.1",
+    "version": "18.0.1.0.1",
     "development_status": "Beta",
     "category": "Accounting & Finance",
     "website": "https://github.com/OCA/account-invoicing",

account_receipt_journal/models/account_journal.py

@@ -39,7 +39,7 @@ def _check_receipts_sequence(self):
             if not journals:
                 continue
             previous_sequence_journals = journals.filtered(
-                lambda j: j.sequence < receipt_journal.sequence
+                lambda j, r=receipt_journal: j.sequence < r.sequence
             )
             if not previous_sequence_journals:
                 raise exceptions.ValidationError(

account_receipt_journal/models/account_move.py

@@ -4,18 +4,20 @@
 class AccountMove(models.Model):
     _inherit = "account.move"
 
-    @api.depends("company_id", "invoice_filter_type_domain", "move_type")
+    @api.depends("company_id", "invoice_filter_type_domain")
     def _compute_suitable_journal_ids(self):
         res = super()._compute_suitable_journal_ids()
-        for m in self:
-            dedicated_journals = m.suitable_journal_ids.filtered(
-                lambda j: j.receipts == m.move_type in {"out_receipt", "in_receipt"}
+        for move in self:
+            if move.move_type in {"in_receipt", "out_receipt"}:
+                move.suitable_journal_ids = move.suitable_journal_ids.filtered(
+                    "receipts"
+                )
+                continue
+            move.suitable_journal_ids = move.suitable_journal_ids.filtered(
+                lambda x: not x.receipts
             )
-            # Suitable journals dedicated to receipts if exists
-            m.suitable_journal_ids = dedicated_journals or m.suitable_journal_ids
         return res
 
-    @api.model
     def _search_default_receipt_journal(self, journal_types):
         company_id = self.env.context.get("default_company_id", self.env.company.id)
         currency_id = self.env.context.get("default_currency_id")
@@ -33,14 +35,13 @@ def _search_default_receipt_journal(self, journal_types):
             journal = self.env["account.journal"].search(domain, limit=1)
         return journal
 
-    @api.model
-    def _search_default_journal(self, journal_types):
-        journal = super()._search_default_journal(journal_types)
-        move_type = self.env.context.get("default_move_type")
+    def _search_default_journal(self):
+        journal = super()._search_default_journal()
         # We can assume that if move_type is not in receipts, a journal without
         # receipts it's coming because of the Journal constraint
-        if move_type not in {"in_receipt", "out_receipt"} or journal.receipts:
+        if self.move_type not in {"in_receipt", "out_receipt"} or journal.receipts:
             return journal
+        journal_types = self._get_valid_journal_types()
         return self._search_default_receipt_journal(journal_types) or journal
 
     def _get_journal_types(self, move_type):
@@ -88,8 +89,10 @@ def create(self, vals_list):
 
     @api.constrains("move_type", "journal_id")
     def _check_receipts_journal(self):
-        """Ensure that Receipt Journal is only used in Receipts
-        if exists Receipt Journals for its type"""
+        """
+        Ensure that Receipt Journal is only used in Receipts
+        if exists Receipt Journals for its type
+        """
         aj_model = self.env["account.journal"]
         receipt_domain = [("receipts", "=", True)]
         has_in_rjournals = aj_model.search([("type", "=", "purchase")] + receipt_domain)

account_receipt_journal/tests/test_receipts.py

@@ -6,21 +6,22 @@
 
 @tagged("post_install", "-at_install")
 class TestReceipts(AccountTestInvoicingCommon):
-    def setUp(self):
-        super().setUp()
-        self.out_receipt_journal = self.env["account.journal"].create(
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.out_receipt_journal = cls.env["account.journal"].create(
             {
                 "name": "Sale Receipts Journal",
-                "code": "S-REC",
+                "code": "SREC",
                 "type": "sale",
                 "receipts": True,
                 "sequence": 99,
             }
         )
-        self.in_receipt_journal = self.env["account.journal"].create(
+        cls.in_receipt_journal = cls.env["account.journal"].create(
             {
                 "name": "Purchase Receipts Journal",
-                "code": "P-REC",
+                "code": "PREC",
                 "type": "purchase",
                 "receipts": True,
                 "sequence": 99,

account_receipt_journal/views/account_journal_views.xml

@@ -9,7 +9,7 @@
                 <group
                     name="receipts"
                     string="Receipts"
-                    attrs="{'invisible': [('type', 'not in',  ('sale', 'purchase'))]}"
+                    invisible="type not in ('sale', 'purchase')"
                 >
                     <field name="receipts" />
                 </group>