[MIG] fleet_vehicle_usage: Migration to 17.0

TT52301
OCA · Dec 19, 2024 · 4aff1d9 · 4aff1d9
1 parent a959841
commit 4aff1d9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 37 deletions.
diff --git a/fleet_vehicle_usage/__manifest__.py b/fleet_vehicle_usage/__manifest__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Fleet Vehicle Usage",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Human Resources/Fleet",
     "website": "https://github.com/OCA/fleet",
     "author": "César Fernández, Tecnativa, Odoo Community Association (OCA)",

diff --git a/fleet_vehicle_usage/models/fleet_vehicle_usage.py b/fleet_vehicle_usage/models/fleet_vehicle_usage.py
@@ -36,63 +36,45 @@ class FleetVehicleUsage(models.Model):
         required=True,
         index=True,
         default=lambda self: self.env.company.id,
-        readonly=True,
-        states={"draft": [("readonly", False)], "reserved": [("readonly", False)]},
         tracking=True,
     )
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Driver",
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", False)], "reserved": [("readonly", False)]},
         tracking=True,
     )
     picking_user_id = fields.Many2one(
         comodel_name="res.users",
         string="Picked up by",
-        readonly=True,
-        states={"draft": [("readonly", False)], "reserved": [("readonly", False)]},
         tracking=True,
     )
     return_user_id = fields.Many2one(
         comodel_name="res.users",
         string="Returned by",
-        states={
-            "in_use": [("required", True)],
-            "returned": [("readonly", True)],
-            "cancel": [("readonly", True)],
-        },
         tracking=True,
     )
     date_picking = fields.Datetime(
         string="Picking Date",
         copy=False,
         index=True,
-        readonly=True,
-        states={"draft": [("readonly", False)], "reserved": [("readonly", False)]},
         tracking=True,
     )
     date_return = fields.Datetime(
         string="Return Date",
         copy=False,
         index=True,
-        states={"returned": [("readonly", True)], "cancel": [("readonly", True)]},
         tracking=True,
     )
     vehicle_id = fields.Many2one(
         comodel_name="fleet.vehicle",
         string="Vehicle",
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", False)], "reserved": [("readonly", False)]},
         tracking=True,
     )
     partner_id = fields.Many2one(
         comodel_name="res.partner",
         string="Destination",
-        readonly=True,
-        states={"draft": [("readonly", False)], "reserved": [("readonly", False)]},
         change_default=True,
         tracking=True,
     )

diff --git a/fleet_vehicle_usage/views/fleet_vehicle_usage_view.xml b/fleet_vehicle_usage/views/fleet_vehicle_usage_view.xml
@@ -23,21 +23,21 @@
                 <header>
                     <button
                         name="action_pick"
-                        states="draft,reserved"
+                        invisible="state not in ('draft','reserved')"
                         string="Pick"
                         type="object"
                         class="oe_highlight"
                     />
                     <button
                         name="action_return"
-                        states="in_use"
+                        invisible="state!='in_use'"
                         string="Return"
                         type="object"
                         class="oe_highlight"
                     />
                     <button
                         name="action_cancel"
-                        states="draft,reserved,in_use"
+                        invisible="state not in ('draft','reserved','in_use')"
                         string="Cancel"
                         type="object"
                     />
@@ -51,13 +51,23 @@
                     </div>
                     <group>
                         <group>
-                            <field name="user_id" />
-                            <field name="vehicle_id" />
+                            <field
+                                name="user_id"
+                                readonly="state not in ('draft','reserved')"
+                            />
+                            <field
+                                name="vehicle_id"
+                                readonly="state not in ('draft','reserved')"
+                            />
                         </group>
                         <group>
-                            <field name="partner_id" />
+                            <field
+                                name="partner_id"
+                                readonly="state not in ('draft','reserved')"
+                            />
                             <field
                                 name="company_id"
+                                readonly="state not in ('draft','reserved')"
                                 groups="base.group_multi_company"
                             />
                         </group>
@@ -67,16 +77,26 @@
                             <field name="create_date" invisible="1" />
                             <field
                                 name="picking_user_id"
-                                attrs="{'required': [('create_date', '!=', False)]}"
+                                readonly="state not in ('draft','reserved')"
+                                required="not create_date"
                             />
                             <field
                                 name="return_user_id"
-                                states="in_use,returned,cancel"
+                                required="state=='in_use'"
+                                readonly="state in ('returned', 'cancel')"
+                                invisible="state not in ('in_use','returned','cancel')"
                             />
                         </group>
                         <group>
-                            <field name="date_picking" />
-                            <field name="date_return" states="in_use,returned,cancel" />
+                            <field
+                                name="date_picking"
+                                readonly="state not in ('draft','reserved')"
+                            />
+                            <field
+                                name="date_return"
+                                readonly="state in ('returned','cancel')"
+                                invisible="state not in ('in_use','returned','cancel')"
+                            />
                         </group>
                     </group>
                     <separator string="Notes" />

diff --git a/fleet_vehicle_usage/views/fleet_vehicle_view.xml b/fleet_vehicle_usage/views/fleet_vehicle_view.xml
@@ -24,10 +24,7 @@
                 <field name="in_use" />
             </templates>
             <xpath expr="//div[hasclass('oe_kanban_details')]" position="inside">
-                <span
-                    class="label label-primary"
-                    attrs="{'invisible': [('in_use', '=', False)]}"
-                >In use</span>
+                <span class="label label-primary" invisible="not in_use">In use</span>
             </xpath>
         </field>
     </record>
@@ -48,10 +45,7 @@
             </div>
             <field name="tag_ids" position="after">
                 <field name="in_use" invisible="1" />
-                <span
-                    class="label label-primary"
-                    attrs="{'invisible': [('in_use', '=', False)]}"
-                >In use</span>
+                <span class="label label-primary" invisible="not in_use">In use</span>
             </field>
         </field>
     </record>