From ceba69f3eda14d6d741b123d6e906dbaac661e4e Mon Sep 17 00:00:00 2001
From: "Jurgen (jugj)" <jugj@odoo.com>
Date: Fri, 24 Mar 2023 13:28:28 +0000
Subject: [PATCH] [IMP] (l10n_be_hr_payroll)_fleet : Improve the visual of
 fleet contracts

task - 3247012

closes odoo/odoo#120865

X-original-commit: 88cc0f78dd9f7f7f8d0c29c54ca4ffbd8a9a0911
Related: odoo/enterprise#40829
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 .../models/fleet_vehicle_log_contract.py      |  2 +-
 .../fleet/views/fleet_vehicle_cost_views.xml  | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/fleet/models/fleet_vehicle_log_contract.py b/addons/fleet/models/fleet_vehicle_log_contract.py
index 59d1e6b0e55..323a057cda2 100644
--- a/addons/fleet/models/fleet_vehicle_log_contract.py
+++ b/addons/fleet/models/fleet_vehicle_log_contract.py
@@ -47,7 +47,7 @@ class FleetVehicleLogContract(models.Model):
         help='Choose whether the contract is still valid or not',
         tracking=True,
         copy=False)
-    notes = fields.Html('Terms and Conditions', help='Write here all supplementary information relative to this contract', copy=False)
+    notes = fields.Html('Terms and Conditions', copy=False)
     cost_generated = fields.Monetary('Recurring Cost', tracking=True)
     cost_frequency = fields.Selection([
         ('no', 'No'),
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
index ceb6f99ac65..6026294d448 100644
--- a/addons/fleet/views/fleet_vehicle_cost_views.xml
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -20,20 +20,30 @@
                     <div class="oe_title">
                         <h1><field name="name"/></h1>
                     </div>
-                    <group col="2">
-                        <group string="Contract Information">
-                            <field name="user_id" widget="many2one_avatar_user"/>
+                    <group string="Information" col="2">
+                        <group col="1">
+                            <field name="ins_ref"/>
                             <field name="cost_subtype_id"/>
                             <field name="insurer_id" widget="many2one_avatar"/>
-                            <field name="ins_ref"/>
+                            <field name="service_ids" widget="many2many_tags"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group string="Vehicle Information">
-                            <field name="vehicle_id"/>
+                        <group col="2">
+                            <field name="start_date"/>
+                            <field name="expiration_date" attrs="{'required': [('cost_frequency', '!=', 'no')]}"/>
+                            <field name="user_id" widget="many2one_avatar_user"/>
+                            <field name="purchaser_id" invisible="1"/>
+                        </group>
+                    </group>
+                    <group string="Vehicle" col="2">
+                        <group col="1">
+                            <field name="vehicle_id" readonly="1"/>
+                        </group>
+                        <group col="2">
                             <field name="purchaser_id" widget="many2one_avatar"/>
                         </group>
                     </group>
-                    <group col="2">
+                    <group string="Cost" col="2">
                         <group>
                             <field name="amount" string="Activation Cost" help="Cost that is paid only once at the creation of the contract" widget="monetary" class="w-25"/>
                             <label for="cost_generated"/>
@@ -45,13 +55,9 @@
                             </div>
                         </group>
                         <group>
-                            <field name="date" string="Invoice Date"/>
-                            <field name="start_date"/>
-                            <field name="expiration_date" attrs="{'required': [('cost_frequency', '!=', 'no')]}"/>
+                            <field name="date"/>
                         </group>
                     </group>
-                    <separator string="Included Services"/>
-                    <field name="service_ids" widget="many2many_tags" nolabel="1"/>
                     <separator string="Terms and Conditions"/>
                     <field name="notes" nolabel="1" placeholder="Write here all other information relative to this contract" />
                 </sheet>