[MIG] account_cash_deposit: migrate to v18

Fix bug in name_get(), converted to _compute_display_name() for v18 migration

Author: alexis-via

account_cash_deposit/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     "name": "Account Cash Deposit",
-    "version": "16.0.1.2.0",
+    "version": "18.0.1.0.0",
     "category": "Accounting",
     "license": "AGPL-3",
     "summary": "Manage cash deposits and cash orders",
@@ -14,6 +14,8 @@
     "data": [
         "security/ir.model.access.csv",
         "security/security.xml",
+        "report/report.xml",
+        "report/report_cashdeposit.xml",
         "wizards/account_cash_order_reception_view.xml",
         "data/sequence.xml",
         "data/cash_unit_eur.xml",
@@ -23,8 +25,6 @@
         "views/account_cash_deposit.xml",
         "views/cash_unit.xml",
         "views/res_currency.xml",
-        "report/report.xml",
-        "report/report_cashdeposit.xml",
     ],
     "installable": True,
 }

account_cash_deposit/models/account_cash_deposit.py

@@ -2,7 +2,7 @@
 # @author: Alexis de Lattre <[email protected]>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
 
 
@@ -14,7 +14,11 @@ class AccountCashDeposit(models.Model):
     _check_company_auto = True
 
     name = fields.Char(
-        string="Reference", size=64, readonly=True, default="/", copy=False
+        string="Reference",
+        size=64,
+        readonly=True,
+        default=lambda self: _("New"),
+        copy=False,
     )
     operation_type = fields.Selection(
         [
@@ -28,16 +32,11 @@ class AccountCashDeposit(models.Model):
         "account.cash.deposit.line",
         "parent_id",
         string="Lines",
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
     )
     order_date = fields.Date(
         default=fields.Date.context_today,
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
     )
     date = fields.Date(
-        states={"done": [("readonly", "=", True)]},
         tracking=True,
         copy=False,
         help="Used as date for the journal entry.",
@@ -48,16 +47,12 @@ class AccountCashDeposit(models.Model):
         domain="[('company_id', '=', company_id), ('type', '=', 'cash')]",
         required=True,
         check_company=True,
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
         tracking=True,
     )
     currency_id = fields.Many2one(
         "res.currency",
         required=True,
         tracking=True,
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
     )
     state = fields.Selection(
         [
@@ -83,22 +78,16 @@ class AccountCashDeposit(models.Model):
         domain="[('company_id', '=', company_id), ('type', '=', 'bank'), "
         "('bank_account_id', '!=', False)]",
         check_company=True,
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
         tracking=True,
     )
     company_id = fields.Many2one(
         "res.company",
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
         tracking=True,
     )
     coin_amount = fields.Monetary(
         string="Loose Coin Amount",
         currency_field="currency_id",
-        readonly=True,
-        states={"draft": [("readonly", "=", False)]},
         tracking=True,
         help="If your bank has a coin counting machine, enter the total amount "
         "of coins counted by the machine instead of creating a line for each type "
@@ -189,7 +178,9 @@ def default_get(self, fields_list):
                     ("currency_id", "=", currency.id),
                 ]
             )
-            res["line_ids"] = [(0, 0, {"cash_unit_id": cu.id}) for cu in cash_units]
+            res["line_ids"] = [
+                Command.create({"cash_unit_id": cu.id}) for cu in cash_units
+            ]
         return res
 
     @api.depends("line_ids.subtotal", "coin_amount")
@@ -241,32 +232,33 @@ def backtodraft(self):
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
-            if "company_id" in vals:
-                self = self.with_company(vals["company_id"])
-            if vals.get("name", "/") == "/":
+            if vals.get("name", _("New")) == _("New"):
                 if (
                     vals.get("operation_type") == "order"
                     or self._context.get("default_operation_type") == "order"
                 ):
-                    vals["name"] = self.env["ir.sequence"].next_by_code(
-                        "account.cash.order", vals.get("order_date")
+                    vals["name"] = (
+                        self.env["ir.sequence"]
+                        .with_company(vals.get("company_id"))
+                        .next_by_code("account.cash.order", vals.get("order_date"))
                     )
                 else:
-                    vals["name"] = self.env["ir.sequence"].next_by_code(
-                        "account.cash.deposit"
+                    vals["name"] = (
+                        self.env["ir.sequence"]
+                        .with_company(vals.get("company_id"))
+                        .next_by_code("account.cash.deposit")
                     )
         return super().create(vals_list)
 
-    def name_get(self):
-        res = []
+    @api.depends("operation_type", "name")
+    def _compute_display_name(self):
         type2label = dict(
             self.fields_get("operation_type", "selection")["operation_type"][
                 "selection"
             ]
         )
         for rec in self:
-            res.append((rec.id, " ".join([type2label[self.operation_type], self.name])))
-        return res
+            rec.display_name = " ".join([type2label[rec.operation_type], rec.name])
 
     def confirm_order(self):
         self.ensure_one()
@@ -321,7 +313,7 @@ def _prepare_account_move(self, vals):
             "date": date,
             "ref": self.display_name,
             "company_id": self.company_id.id,
-            "line_ids": [(0, 0, cash_vals), (0, 0, bank_vals)],
+            "line_ids": [Command.create(cash_vals), Command.create(bank_vals)],
         }
         return move_vals
 
@@ -380,11 +372,6 @@ def currency_change(self):
                 else:
                     self.cash_journal_id = False
 
-    def get_report(self):
-        report = self.env.ref("account_cash_deposit.report_account_cash_deposit")
-        action = report.with_context(discard_logo_check=True).report_action(self)
-        return action
-
 
 class AccountCashDepositLine(models.Model):
     _name = "account.cash.deposit.line"

account_cash_deposit/models/cash_unit.py

@@ -17,6 +17,10 @@ class CashUnit(models.Model):
     _order = "currency_id, tree_order desc"
     _rec_name = "value"
 
+    # In the point_of_sale module, there is a model pos.bill that represent coins
+    # and notes. But we can't use it because it's in the point_of_sale module and
+    # the datamodel is very badly designed. That's why we create our own model.
+
     currency_id = fields.Many2one("res.currency", ondelete="cascade")
     active = fields.Boolean(default=True)
     tree_order = fields.Float(compute="_compute_all", store=True)
@@ -98,8 +102,8 @@ def _get_value_label(self, value):
             value_label = format_amount(self.env, value, self.currency_id)
         return value_label
 
-    def name_get(self):
-        res = []
+    @api.depends("cash_type", "value", "coinroll_qty")
+    def _compute_display_name(self):
         type2label = dict(
             self.fields_get("cash_type", "selection")["cash_type"]["selection"]
         )
@@ -108,16 +112,13 @@ def name_get(self):
             value_label = rec._get_value_label(rec.value)
             if rec.cash_type == "coinroll":
                 total_value_label = rec._get_value_label(rec.total_value)
-                label = "%s %s x %d (%s)" % (
-                    cash_type_label,
-                    value_label,
-                    rec.coinroll_qty,
-                    total_value_label,
+                label = (
+                    f"{cash_type_label} {value_label} x {rec.coinroll_qty} "
+                    f"({total_value_label})"
                 )
             else:
                 label = f"{cash_type_label} {value_label}"
-            res.append((rec.id, label))
-        return res
+            rec.display_name = label
 
     @api.model
     def name_search(self, name="", args=None, operator="ilike", limit=100):
@@ -127,7 +128,7 @@ def name_search(self, name="", args=None, operator="ilike", limit=100):
             if name.isdigit():
                 recs = self.search([("value", "=", name)] + args, limit=limit)
                 if recs:
-                    return recs.name_get()
+                    return [(rec.id, rec.display_name) for rec in recs]
             value = False
             try:
                 value = float(name)
@@ -136,7 +137,7 @@ def name_search(self, name="", args=None, operator="ilike", limit=100):
             if value:
                 recs = self.search([("value", "=", value)] + args, limit=limit)
                 if recs:
-                    return recs.name_get()
+                    return [(rec.id, rec.display_name) for rec in recs]
             lang = self.env["res.lang"]._lang_get(self.env.user.lang)
             if lang:
                 decimal_sep = lang.decimal_point
@@ -148,5 +149,5 @@ def name_search(self, name="", args=None, operator="ilike", limit=100):
                     if value:
                         recs = self.search([("value", "=", value)] + args, limit=limit)
                         if recs:
-                            return recs.name_get()
+                            return [(rec.id, rec.display_name) for rec in recs]
         return super().name_search(name=name, args=args, operator=operator, limit=limit)

account_cash_deposit/security/ir.model.access.csv

@@ -2,5 +2,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_cash_deposit_user,Full rights on account.cash.deposit to Accountant,model_account_cash_deposit,account.group_account_user,1,1,1,1
 access_account_cash_deposit_line_user,Full rights on account.cash.deposit.line to Accountant,model_account_cash_deposit_line,account.group_account_user,1,1,1,1
 access_account_cash_order_reception,Full rights on account.cash.order.reception wizard,model_account_cash_order_reception,account.group_account_user,1,1,1,1
-cash_unit_read,Read rights on cash.unit to everybody,model_cash_unit,,1,0,0,0
+cash_unit_read,Read rights on cash.unit to employee,model_cash_unit,base.group_user,1,0,0,0
 cash_unit_full,Full rights on cash.unit to System group,model_cash_unit,base.group_system,1,1,1,1

account_cash_deposit/tests/test_cash_deposit.py

@@ -8,33 +8,35 @@
 
 
 class TestAccountCashDeposit(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.company = self.env.ref("base.main_company")
-        self.currency = self.company.currency_id
-        self.cash_journal = self.env["account.journal"].search(
-            [("type", "=", "cash"), ("company_id", "=", self.company.id)], limit=1
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
+        cls.company = cls.env.ref("base.main_company")
+        cls.currency = cls.company.currency_id
+        cls.cash_journal = cls.env["account.journal"].search(
+            [("type", "=", "cash"), ("company_id", "=", cls.company.id)], limit=1
         )
-        self.bank_journal = self.env["account.journal"].search(
-            [("type", "=", "bank"), ("company_id", "=", self.company.id)], limit=1
+        cls.bank_journal = cls.env["account.journal"].search(
+            [("type", "=", "bank"), ("company_id", "=", cls.company.id)], limit=1
         )
-        self.cash_unit_note = self.env["cash.unit"].search(
-            [("currency_id", "=", self.currency.id), ("cash_type", "=", "note")],
+        cls.cash_unit_note = cls.env["cash.unit"].search(
+            [("currency_id", "=", cls.currency.id), ("cash_type", "=", "note")],
             limit=1,
         )
-        self.cash_unit_coinroll = self.env["cash.unit"].search(
-            [("currency_id", "=", self.currency.id), ("cash_type", "=", "coinroll")],
+        cls.cash_unit_coinroll = cls.env["cash.unit"].search(
+            [("currency_id", "=", cls.currency.id), ("cash_type", "=", "coinroll")],
             limit=1,
         )
-        self.all_cash_units = self.env["cash.unit"].search(
-            [("currency_id", "=", self.currency.id)]
+        cls.all_cash_units = cls.env["cash.unit"].search(
+            [("currency_id", "=", cls.currency.id)]
         )
-        self.date = date.today()
-        self.yesterday = date.today() - timedelta(days=1)
-        self.deposit_seq = self.env["ir.sequence"].search(
+        cls.date = date.today()
+        cls.yesterday = date.today() - timedelta(days=1)
+        cls.deposit_seq = cls.env["ir.sequence"].search(
             [("code", "=", "account.cash.deposit")]
         )
-        self.order_seq = self.env["ir.sequence"].search(
+        cls.order_seq = cls.env["ir.sequence"].search(
             [("code", "=", "account.cash.order")]
         )
 
@@ -80,7 +82,7 @@ def test_cash_order(self):
         self.assertEqual(len(order.line_ids), 2)
         wizard = (
             self.env["account.cash.order.reception"]
-            .with_context(default_order_id=order.id)
+            .with_context(active_model="account.cash.deposit", active_id=order.id)
             .create({"date": self.yesterday})
         )
         wizard.run()