From af12e73de414bb3f4d5888cf4a91bcec880a8705 Mon Sep 17 00:00:00 2001
From: esraa <e.mostafa@exp-sa.com>
Date: Tue, 8 Oct 2024 15:47:05 +0300
Subject: [PATCH] updates in fleet

---
 odex25_fleet/odex_fleet/i18n/ar_001.po        | 19 +++++++--
 odex25_fleet/odex_fleet/models/__init__.py    |  3 +-
 .../odex_fleet/models/fleet_service_type.py   | 10 +++++
 .../odex_fleet/models/maintenance_request.py  |  2 +-
 odex25_fleet/odex_fleet/models/vehicle.py     | 23 ++++++++---
 .../odex_fleet/views/driver_departments.xml   |  4 +-
 .../odex_fleet/views/vehicle_view.xml         | 39 ++++++++++++++-----
 7 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 odex25_fleet/odex_fleet/models/fleet_service_type.py

diff --git a/odex25_fleet/odex_fleet/i18n/ar_001.po b/odex25_fleet/odex_fleet/i18n/ar_001.po
index d8b49ae30..0b5769b0d 100644
--- a/odex25_fleet/odex_fleet/i18n/ar_001.po
+++ b/odex25_fleet/odex_fleet/i18n/ar_001.po
@@ -308,7 +308,8 @@ msgstr "مبلغ الدفعة"
 #: model_terms:ir.ui.view,arch_db:odex_fleet.odex_fleet_vehicle_log_services_view_form
 #: model_terms:ir.ui.view,arch_db:odex_fleet.vehicle_infraction_view_form
 msgid "Approve"
-msgstr ""
+msgstr "اعتماد"
+
 
 #. module: odex_fleet
 #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_log_fuel__state__approve
@@ -990,6 +991,16 @@ msgstr "الاسم المعروض"
 msgid "Draft"
 msgstr "مسودة"
 
+
+#. module: odex_fleet
+#: model:res.groups,name:odex_fleet.fleet_group_draft
+#: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_form_renew_view_form
+#: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_request_maintenance_view_form
+#: model_terms:ir.ui.view,arch_db:odex_fleet.odex_fleet_vehicle_log_fuel_view_form
+#: model_terms:ir.ui.view,arch_db:odex_fleet.odex_fleet_vehicle_log_services_view_form
+msgid "Set To Draft"
+msgstr "إرسال الى مسودة"
+
 #. module: odex_fleet
 #: model:ir.model.fields,field_description:odex_fleet.field_fleet_maintenance__employee_id
 #: model:ir.model.fields,field_description:odex_fleet.field_fleet_vehicle__driver_id
@@ -1345,14 +1356,14 @@ msgstr ""
 #. module: odex_fleet
 #: model_terms:ir.ui.view,arch_db:odex_fleet.invoice_report_pdf
 msgid "From"
-msgstr ""
+msgstr "استمارة"
 
 #. module: odex_fleet
 #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_account_config__type__fuel
 #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_cost__cost_type__fuel
 #: model_terms:ir.ui.view,arch_db:odex_fleet.car_consumption_cost_report_pdf
 msgid "Fuel"
-msgstr ""
+msgstr "وقود"
 
 #. module: odex_fleet
 #: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_vehicle_log_fuel_view_tree
@@ -2271,7 +2282,7 @@ msgstr "المالك"
 #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_maintenance__state__paid
 #: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_request_maintenance_view_form
 msgid "Paid"
-msgstr ""
+msgstr "إنشاء فاتورة"
 
 #. module: odex_fleet
 #: model:ir.model.fields,field_description:odex_fleet.field_fleet_vehicle_cost__parent_id
diff --git a/odex25_fleet/odex_fleet/models/__init__.py b/odex25_fleet/odex_fleet/models/__init__.py
index 4fa52cc41..f6402966b 100644
--- a/odex25_fleet/odex_fleet/models/__init__.py
+++ b/odex25_fleet/odex_fleet/models/__init__.py
@@ -7,4 +7,5 @@ from . import form_renew
 from . import account_config
 from . import insurance_companies
 from . import infractions
-from . import driver_departments
\ No newline at end of file
+from . import driver_departments
+from . import fleet_service_type
\ No newline at end of file
diff --git a/odex25_fleet/odex_fleet/models/fleet_service_type.py b/odex25_fleet/odex_fleet/models/fleet_service_type.py
new file mode 100644
index 000000000..02e3d0335
--- /dev/null
+++ b/odex25_fleet/odex_fleet/models/fleet_service_type.py
@@ -0,0 +1,10 @@
+from odoo import models, fields, api, _
+
+
+class FleetServiceType(models.Model):
+    _inherit = 'fleet.service.type'
+    _description = 'Fleet Service Type'
+
+    category = fields.Selection([
+        ('service', 'Service')
+    ], 'Category', required=True, help='Choose whether the service refer to contracts, vehicle services or both')
diff --git a/odex25_fleet/odex_fleet/models/maintenance_request.py b/odex25_fleet/odex_fleet/models/maintenance_request.py
index 13d58e3d3..8765ca2b4 100644
--- a/odex25_fleet/odex_fleet/models/maintenance_request.py
+++ b/odex25_fleet/odex_fleet/models/maintenance_request.py
@@ -41,7 +41,7 @@ class FleetMaintenance(models.Model):
     employee_id = fields.Many2one('hr.employee', string="Driver" )
     quotation_ids = fields.One2many('fleet.quotation','request_id',string="Quotations")
     service_ids = fields.One2many('fleet.quotation.service','request_id',string="Quotations")
-    branch_id = fields.Many2one('res.branch', string="Branch", default=lambda self: self.env.user.branch_id )
+    branch_id = fields.Many2one('hr.department', string="Branch")
     # log_id = fields.Many2one('fleet.vehicle.log.services', string="Service Log")
     total_cost = fields.Float( string="Total Cost", compute="get_cost",store=True )
     total1 = fields.Float(string="Total",compute="get_total",store=True )
diff --git a/odex25_fleet/odex_fleet/models/vehicle.py b/odex25_fleet/odex_fleet/models/vehicle.py
index 58172b403..e48c4c4b8 100644
--- a/odex25_fleet/odex_fleet/models/vehicle.py
+++ b/odex25_fleet/odex_fleet/models/vehicle.py
@@ -5,15 +5,18 @@ from datetime import timedelta
 from dateutil.relativedelta import relativedelta
 import math
 
+
 class FleetBranch(models.Model):
     _inherit = 'res.branch'
 
     state_id = fields.Many2one('res.country.state', string="State", )
-    
+
+
 class Partner(models.Model):
     _inherit = 'res.partner'
 
-    car_owner = fields.Boolean( string="Car Owner", )
+    car_owner = fields.Boolean(string="Car Owner", )
+
 
 class FleetVehicle(models.Model):
     _inherit = 'fleet.vehicle'
@@ -22,7 +25,7 @@ class FleetVehicle(models.Model):
     insurance_companies_id = fields.Many2one('insurance.companies', string="Insurance Companies")
     employee_id = fields.Many2one('hr.employee', string="Driver")
     driver_id = fields.Many2one(related='employee_id.user_id.partner_id', store=True, string="Driver")
-    branch_id = fields.Many2one('hr.department', string="Branch",)
+    branch_id = fields.Many2one('hr.department', string="Branch", )
     states = fields.Many2one('res.country.state', string="State", )
     old_branch_id = fields.Many2one('res.branch', string="Old Branch", )
     license_end = fields.Date(string="License End")
@@ -307,7 +310,7 @@ class FleetVehicleLogServices(models.Model):
     account_id = fields.Many2one('account.account', string="Account")
     tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict')
     invoice_id = fields.Many2one('account.move', string="Invoice", copy=False)
-    partner_id = fields.Many2one('res.partner', string="Service Provider")
+    partner_id = fields.Many2one('res.partner', string="Service Provider", required=1)
     request_id = fields.Many2one('fleet.maintenance', string="Maintenance Request")
     state = fields.Selection([
         ('draft', 'Draft'),
@@ -336,6 +339,13 @@ class FleetVehicleLogServices(models.Model):
         default=lambda self: self.env.ref('fleet.type_service_service_8', raise_if_not_found=False),
     )
 
+    def copy(self, default=None):
+        default = dict(default or {})
+        default.update({
+            'status': 'draft',
+        })
+        return super(FleetVehicleLogServices, self).copy(default)
+
     @api.onchange('odometer')
     def onchange_odometer(self):
         for rec in self:
@@ -350,7 +360,7 @@ class FleetVehicleLogServices(models.Model):
 
     def set_to_draft(self):
         for rec in self:
-            rec.state = 'draft'
+            rec.status = 'draft'
 
     def action_confirm(self):
         self.sudo().status = 'confirm'
@@ -443,7 +453,8 @@ class FleetVehicleLogFuel(models.Model):
             print("pass")
             # pass
         else:
-            raise ValidationError(_("You Need To Configurate Account Details"))
+            pass
+            # raise ValidationError(_("You Need To Configurate Account Details"))
         return res
 
     liter = fields.Float()
diff --git a/odex25_fleet/odex_fleet/views/driver_departments.xml b/odex25_fleet/odex_fleet/views/driver_departments.xml
index 18118fde8..ee5b98024 100644
--- a/odex25_fleet/odex_fleet/views/driver_departments.xml
+++ b/odex25_fleet/odex_fleet/views/driver_departments.xml
@@ -49,7 +49,7 @@
                 </p>
             </field>
         </record>
-<!--        <menuitem name="Departments" parent="fleet.menu_root" id="vehicles_infractions" sequence="2"/>-->
-        <menuitem action="driver_department_action" name="Departments" parent="fleet.fleet_configuration" id="driver_department_menu"/>
+<!--        <menuitem name="Departments" parent="fleet.menu_root" id="vehicles_infractions" sequence="2" active="False"/>-->
+<!--        <menuitem action="driver_department_action" name="Departments" parent="fleet.fleet_configuration" id="driver_department_menu"/>-->
     </data>
 </odoo>
\ No newline at end of file
diff --git a/odex25_fleet/odex_fleet/views/vehicle_view.xml b/odex25_fleet/odex_fleet/views/vehicle_view.xml
index 3037d008f..960723d60 100644
--- a/odex25_fleet/odex_fleet/views/vehicle_view.xml
+++ b/odex25_fleet/odex_fleet/views/vehicle_view.xml
@@ -179,7 +179,8 @@
             </field>
         </record>
 
-        <!--        <menuitem action="fleet_vehicle_costs_action" parent="fleet.fleet_vehicles" id="fleet_vehicle_costs_menu" groups="fleet.fleet_group_manager"/>-->
+        <menuitem action="fleet_vehicle_costs_action" parent="fleet.fleet_vehicles" id="fleet_vehicle_costs_menu"
+                  groups="fleet.fleet_group_manager"/>
 
 
         <record model="ir.ui.view" id="odex_view_fleet_vehicle_form">
@@ -246,7 +247,7 @@
                             <field name="vehicle_type" invisible="1"/>
                             <field name="states"/>
                             <field name="branch_id"/>
-                            <!--                            <field name="owner_id" domain="[('car_owner','=',True)]" required="1"/>-->
+                            <field name="owner_id" domain="[('car_owner','=',True)]"/>
                             <field name="fleet_type_id" readonly="1"/>
                             <field name="car_category"/>
                             <field name="man_company" readonly="1"/>
@@ -397,11 +398,13 @@
                   name="Vehicle Type" parent="fleet.fleet_configuration" id="fleet_type_menu" sequence="100"
                   groups="fleet.fleet_group_user"/>
 
-        <!--        <menuitem id="res_states_menu" name="States" sequence="1"-->
-        <!--                  parent="fleet.fleet_configuration" groups="fleet.fleet_group_user,fleet_group_hr_officer" action="base.action_country_state" />-->
+        <menuitem id="res_states_menu" name="States" sequence="1"
+                  parent="fleet.fleet_configuration" groups="fleet.fleet_group_user,fleet_group_hr_officer"
+                  action="base.action_country_state"/>
 
-        <!--        <menuitem id="res_branches_menu" name="Branch"-->
-        <!--                  parent="fleet.fleet_configuration" groups="fleet_group_supervisor,fleet_group_hr_officer" action="branch.branch_action_res_branch" sequence="2"/>-->
+        <menuitem id="res_branches_menu" name="Branch"
+                  parent="fleet.fleet_configuration" groups="fleet_group_supervisor,fleet_group_hr_officer"
+                  action="branch.branch_action_res_branch" sequence="2"/>
 
         <!--        fuel type-->
         <record id='fleet_fuel_price_view_form' model='ir.ui.view'>
@@ -543,8 +546,9 @@
             </field>
         </record>
 
-        <!--        <menuitem  action="man_company_action"-->
-        <!--                   name="Manufacture Company" parent="fleet.fleet_configuration" id="man_company_menu" groups="fleet.fleet_group_user" sequence="101"/>-->
+        <menuitem action="man_company_action"
+                  name="Manufacture Company" parent="fleet.fleet_configuration" id="man_company_menu"
+                  groups="fleet.fleet_group_user" sequence="101"/>
         <!-- Transmission Type -->
         <record id='fleet_transmission_view_form' model='ir.ui.view'>
             <field name="name">fleet.vehicle.transmission.setting.model.form</field>
@@ -653,7 +657,8 @@
         </record>
 
         <!--       -->
-        <!--        <menuitem action="action_partner_owner_form" groups="fleet.fleet_group_user" parent="fleet.fleet_vehicles" sequence="3" id="fleet_vehicle_owner_menu"/>-->
+        <menuitem action="action_partner_owner_form" groups="fleet.fleet_group_user" parent="fleet.fleet_vehicles"
+                  sequence="3" id="fleet_vehicle_owner_menu"/>
         <!--       -->
         <menuitem action="fleet.fleet_vehicle_action" parent="fleet.fleet_vehicles" id="fleet.fleet_vehicle_menu"
                   groups="fleet.fleet_group_user" sequence="2"/>
@@ -746,7 +751,7 @@
                 <tree string="Fuel Logs">
                     <field name="date"/>
                     <field name="vehicle_id"/>
-                    <field name="purchaser_id"/>
+                    <field name="employee_id"/>
                     <field name="inv_ref" invisible="1"/>
                     <field name="vendor_id" invisible="1"/>
                     <field name="odometer"/>
@@ -881,6 +886,17 @@
                 <field name="inv_ref" position="after">
                     <field name="state"/>
                 </field>
+                <field name="purchaser_id" position="replace">
+                    <field name="employee_id"/>
+                </field>
+
+                <field name="service_type_id" position="replace">
+                    <field name="cost_subtype_id"/>
+                </field>
+
+                <field name="vendor_id" position="replace">
+                    <field name="partner_id"/>
+                </field>
 
             </field>
         </record>
@@ -892,6 +908,9 @@
         <menuitem action="fleet.fleet_vehicle_model_brand_action" groups="fleet.fleet_group_user"
                   parent="fleet.fleet_configuration" id="fleet.fleet_vehicle_model_brand_menu" sequence="2"/>
 
+        <menuitem action="fleet.fleet_vehicle_log_contract_action" parent="fleet.fleet_vehicles"
+                  id="fleet.fleet_vehicle_log_contract_menu" groups="fleet.fleet_group_user,fleet_group_hr_officer"
+                  active="False"/>
         <menuitem action="fleet.fleet_vehicle_service_types_action" parent="fleet.fleet_configuration"
                   groups="fleet.fleet_group_user" id="fleet.fleet_vehicle_service_types_menu" sequence="3"/>
         <menuitem id="fleet.fleet_vehicle_tag_menu" parent="fleet.fleet_configuration"