From 40792eb1fdda4e76b782295160b87b48759d63e3 Mon Sep 17 00:00:00 2001
From: Mazen Abdo <one6428300@gmail.com>
Date: Sun, 3 Nov 2024 01:36:48 +0200
Subject: [PATCH] update fleet_tool

---
 ...quest_vehicle_authorization.cpython-38.pyc | Bin 5249 -> 5928 bytes
 .../models/request_vehicle_authorization.py   |  53 ++++++++++++++----
 .../odex_fleet/security/ir.model.access.csv   |   2 +
 .../views/request_vehicle_authorization.xml   |  20 ++++++-
 .../views/vehicle_deleation_view.xml          |   2 +-
 5 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/odex25_fleet/odex_fleet/models/__pycache__/request_vehicle_authorization.cpython-38.pyc b/odex25_fleet/odex_fleet/models/__pycache__/request_vehicle_authorization.cpython-38.pyc
index c1257278858cfef4223edc935c0e31a1246a2c09..5483403b67186c638ff912d09d71df13783fd9ee 100644
GIT binary patch
delta 2483
zcmZ`*-BT1t5Z~F`-TUG`Nl-!H2oYHoL_QQz6a@vu5ToM9`f)DT103G%!Q6s@!a5VF
zBrl|j+E+{AEvZy0saQ#+@)xAaRQ`Z{%2V=^N-B9srOZou=8i)MS*w57^Xs0TnV#v!
z_w-L%!(*XPK*F!@>!!(XYgfa2$>r694Mz=?s%skct`oyID1ir*WeF5Yru~mSMgSQV
zG-R|A69oB+q<dFCs3)VVKUI^?)qj2~MBp&QR*12Ss?!l@6Z&q{_rMXThV~WNsOF16
z2QE^Bybn5|Yf^@zunTQ_h3y#HYSC5)-EbUd^}vZ0#i$p|N$5r9lwcCbG{9--L*|TN
z-Y6iY!CB~s0XVnfF&f1<4(DMIorW;Xn}QjJ3owGrMVzJ@`*7K&b;;O|wh+7}Hr-71
zwF5A^PT+00v@AU)#=$c44qO(@p)zv?t_sF%DN|!`O;D|ZxehnhWw;53;10trxV<bH
zZEy$f;_nei!ae+L2NTBew*yj`T5x06=u|qDp#wBSCrvw@vtB;G;E56vbZ#l_#P58p
z^wjOan_P@+x+JbH%urosmB=%{^Rv={j@4>XtL8+FQ&10Vs9&hP8|t5`=@$-u^m694
zW}Ng)yGW{>U$yrmoOHdZTy|#8rmW`qLvJeymfhKY=Nn&BkUO!a;v&EJOjQ{*v(y>%
zFOwGM2fvQ^mw$-#I;R64s{7Eb%XtxaVz%-LEgTLbEc(E-X~N8>SR3b#An01r-pPqB
z4o5j0LvVdL$Ym++i5=%$Zy8Q;tr?-$`9AnjU3mc!Rwt|jO}bhP*Wy?edSeftaRR~h
z<i@ABhdO|UbIx}a79K+nHPn^8w>ut0#}Q{L)TW*00lS^2p;KK0sOlb8WKehg_p?cB
zE<27JALMS^Hm)Og$%%z;w}(*sl(=f%#=Pw0>xRt~e;LVC&YDQG?3nW`{1r(!mm@bw
zpYvIyXOQR3^)Nb7%$tfsd>;G&ZpB27Ws~!1`XHHxZJTgIrNB6IE>Ed*C_391!C7pW
z!%o}g)_Gh%Q5Z-wnzEBw(=sP1OA$0|d>&NdDE%n;FA<icX=$1u$|xQb1w}>C1nWi3
zhvG*GpafAWP(s2QW<#ilr->y4j}Z}UA<FLJAX=sg$WLMqi5&ya5_v2W$&Rm8g0e)`
zQAf|$K;0v)y^dq@P)09pNiKVNmt^h*xQS%d5^s9`(erxD4btpPCbvK-&s`rL#En3y
zP`mLyY%D`JoJpssm8Yf4c7q#ZYJqswZfJv<$>0q;R=ldfx-nSsu?+FB@r;?blR#%o
zW@o8o^YzYhm-E~jNX_N#94sK~)-pOfN6~q{*f^5roIRCe=|#~zjL7WPZ}Hd}+s0Ga
zX=^fJ=MpJKaSw$=X?9}cI5{ivAZ<@2=FJR7?@8>-zl@iBS~q=+8uS0Z#kzhG9CirK
z12X<3^j++RBo#^p-p7x4lY_zG76(zsx4CwQ!(9$rv&E8}E2oFu!=bCru(V~n-ee{>
ziSN->(iXmaQ5ahB(Ch;GVToc{OkiEim<uA)c;dY4EseGnh}iNXPRq9=NSa2J(!WiO
zGa88sQGVAd1EfNZ5{{blB3kdv#s)|DnXw~W!M7tSS!@Nb6}zoz@oQyg&_QIvRr;q)
zCi3Ab1H2<_&5F|*Z>!x*jjLRx@7k`0na}4ekqYN&yt%QQG1oh6*%ULv_(OX&b<W@M
z+Oa-PDhRF@Umrf%JmZa9^i{??BIDhT@ovRNI9%r-dIZ1DSMnwLo9M}!Lo3e_+4;P(
zK_(T>kCj!0s4wPIn1(Y_C|f?>Ec#IL)d*BF2uKDNy5XV9nhG-hPeB6@R;1$Y9=4_^
zOWXhXlgY+$D)S<Y>Ry)SgJ}-;Ib;z|GQJA4IG7wZoAKthAE99lCC}60BZ|x(p`uqf
ze^l1o@$zSdHRSpyseMsAvEo92KCGStKb@GeQ*_sNGMj_B3_ZmgWj=tgoA~5_Cti@M
F{{;!IV445`

delta 1836
zcmZ`)&r=jf6y9ccXJ?oF0V<$~2x8PhU03iYBCZNSQ85XKW@54#_BFUVv$N@$Mesr;
zQe`e2w68fx4ymMaNySqt@y|$AsxLXGQk7FGx1{o31FNCTR_!<Meedhnue)E*e4YQ)
z%HGOkQW5<9b+B*#+m5H%E;jS@aPP8b*oK#|6D$G|h`Od{+NQQ+ZqiHHDHa)zKpc#f
z2pF8*Z+;xL(~y{oSmtk(&59|*^MSj8GUh7Wg+N7}T1Byv)ufWQ0xrgc@P*3FIBo@;
zu;N!WVKHT*%L`$}<LG1rcQLxaF;(c4DfR2W1Ug0h2dAFC{A1aGV^DzB)h4@x$M5Ih
zINHqKsqF!6??Ss12B8y9plUadKR4jy8ne5QH{leVo^OIP(1Ec%I(8Og-5A>oLvRj9
z4a51>nBAk95x9U%Q8T^B>|2J5a0#i)n(9N!fKeEOw_$uWYVX(nHn;*;Q8R&Q-qOr9
zxDGdvnZ!|X`v6XRa4ljV;@0zixVgsQ9e8&o@|f9&8_at!rI{lQW*TlGQ)c$j1~mh>
zwJ5KdJMjKm6WH*9=8nN#_;4j+7vLi(;qy3r3=TdAU>3^w90b6F<f?Us->Z~eKFVD_
zug~bwi&V6Qv8>!38(?WU85`>E!tH;QdnM_aUaE1cNwgy`((<d=APQBiWb7fLTV9Cw
zZ<>Dm{HFPR-09PTG^J}5Jjj>*dNmYF`5?r8Q1K~x$S&g$rW-S^vt9C;@mY@KDpB^m
zT0P{V`$b<O&zc*F#9?{YJkU%c(Z4?Zs_Do-&Bv@D7n2s^m&q%vD1T2riCZW*As?o`
zaE_C-Krn#tNH=7U6O_duaVHQgV?BPFh%*Fd35F1q>4WcatVRqIS8TvVvW_4O%dq+L
z?#2W<t;NJC3|aB@bOqU&w))P~h!F%8^=I#IO_j&MsGLhzaT!0Sd%GLzt-@m{oRB**
z1>+JWJSQhIBPYkvw4!32L0cssc%^FHo5jK>NLFlsF8nCEH|5LB-GLUgzF{h^59Uo;
zm37K=qf2GKI#&_iv~*i~<b&)pwqO2}y~8fc+qt1}+B+2$d~SX3;^<=A&>~cN&KF*3
zp~4@QDzK#xmDxy+BkKV#%U^Pz<lAtRxK8k<(kU9^KZqejm??kUzE|GJbjrUoU47e-
z`v0L6UBvS9Qf(h!R?Xb2x&9L8SeHsp;l0oc6*o|(Qq+b{b%|;oB_f9}t&NLQ3h`E`
z*yVeUP+7N9=GB02?6!)HQiC^dvb+kqxm0G8so^V-D`P?WJB|)1Q|~(!kU~p@C3;^f
z6Njx^v1z^-DnoE5@T*u<JqUfEqT~-d4lSRf<<g<6#MNrZ=kc_!k+;ot0!+ngn9<|a
zkQOmU+N)Z7$@g9ER8@9P_+IIr*iZ`EQI)`9IDH`K3h53P)SH6(PEg;7Ndg<8N9d!{
zn_eXH73eNY$%VGDD9bYWQ(Le6wXHpqGh5A=pik7Km66}I@2=<Yg86yASmrhAvOpM=
zh&~0vL{ROtA@#80=Ku5Y5J^((BcN=r&0HjxrdQ@LezfW?A7SVPlx-(#VQH3*{tE#J
B-8ujO

diff --git a/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py b/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
index eef505f0b..13fbf7d05 100644
--- a/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
+++ b/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
@@ -1,7 +1,7 @@
 from odoo import models, fields, api, _
-from odoo.exceptions import UserError, ValidationError
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
+import logging
+
+_logger = logging.getLogger(__name__)
 
 
 class VehicleDelegation(models.Model):
@@ -32,7 +32,7 @@ class VehicleDelegation(models.Model):
     model_id = fields.Many2one('fleet.vehicle.model', 'Model', related='vehicle_id.model_id', store=True, )
     fleet_type_id = fields.Many2one('fleet.type', string="Fleet Type", related='vehicle_id.fleet_type_id', store=True, )
     serial_number = fields.Char(related='vehicle_id.serial_number', string="Serial Number")
-    state_id = fields.Many2one('res.country.state', string="State", )
+    # state_id = fields.Many2one('res.country.state', string="State", )
     start_date = fields.Date(string="Start Date")
     end_date = fields.Date(string="End Date")
     reason = fields.Text(string="Reject Reason",  tracking=True,)
@@ -48,6 +48,7 @@ class VehicleDelegation(models.Model):
     last_project_id = fields.Many2one('project.project', string='Last Project', compute="get_last_project", store=True)
     last_branch_id = fields.Many2one('hr.department', string="Last Branch", compute="get_last_branch", store=True,help='The last Branch the vehicle was authorized for')
     from_hr_depart = fields.Boolean()
+    name = fields.Char(string="Name")
 
     @api.depends("vehicle_id")
     def get_first_odometer(self):
@@ -96,6 +97,7 @@ class VehicleDelegation(models.Model):
     #         rec.state = 'in_progress'
 
 
+
     def action_refuse(self):
         form_view_id = self.env.ref("odex_fleet.wizard_reject_reason_fleet_wiz_form").id
         return {
@@ -113,14 +115,43 @@ class VehicleDelegation(models.Model):
     #     for rec in self:
     #         rec.state = 'close'
 
-    def fleet_tool(self):
-        for rec in self:
-            rec.state = 'fleet_tool'
-
     def Direct_manager(self):
         for rec in self:
             rec.state = 'Direct_manager'
 
-    # def action_cancel(self):
-    #     for rec in self:
-    #         rec.sudo().state = 'cancel'
\ No newline at end of file
+    def fleet_tool(self):
+
+        payment_vals = {
+            'employee_id': self.employee_id.id,
+            'name': self.name,
+            'delegation_type': self.delegation_type,
+            'license_number': self.license_number,
+            'license_end': self.license_end,
+            'vehicle_id': self.vehicle_id.id,
+            'license_plate': self.license_plate,
+            'start_date': self.start_date,
+            'end_date': self.end_date,
+            'first_odometer': self.first_odometer,
+            'odometer': self.odometer,
+            'km_number': self.km_number,
+            'last_department_id': self.last_department_id.id,
+            'last_project_id': self.last_project_id.id if self.last_project_id else False,
+            'last_branch_id': self.last_branch_id.id,
+            'custody_id': self.custody_id.id if self.custody_id else False,
+            'request_vehicle_authorization': self.id
+        }
+        print("qqqqqqqqqqqqqqq",payment_vals)
+        _logger.info("Attempting to create vehicle delegation with values: %s", payment_vals)
+
+        payment = self.env['vehicle.delegation'].create(payment_vals)
+        print("aaaaaaaaaaaaaaaaaaaaaaaaaaa",payment)
+        _logger.info("Created vehicle delegation: %s", payment)
+
+        self.state = "fleet_tool"
+        return payment
+
+
+class InheritVehicleDelegation(models.Model):
+    _inherit = "vehicle.delegation"
+
+    request_vehicle_authorization = fields.Many2one('request.vehicle.authorization')
diff --git a/odex25_fleet/odex_fleet/security/ir.model.access.csv b/odex25_fleet/odex_fleet/security/ir.model.access.csv
index 494ad18a0..544df57ac 100644
--- a/odex25_fleet/odex_fleet/security/ir.model.access.csv
+++ b/odex25_fleet/odex_fleet/security/ir.model.access.csv
@@ -91,3 +91,5 @@ access_insurance_companies,insurance_companies,model_insurance_companies,,1,1,1,
 access_vehicle_infraction,vehicle_infraction,model_vehicle_infraction,,1,1,1,1
 access_driver_department,driver_department,model_driver_department,,1,1,1,1
 access_fleet_vehicle_assignation_log_fleet_group_user,fleet_vehicle_assignation_log fleet_group_user,fleet.model_fleet_vehicle_assignation_log,base.group_user,1,1,1,1
+access_request_vehicle_authorization,access_request_vehicle_authorization,model_request_vehicle_authorization,base.group_user,1,1,1,1
+
diff --git a/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml b/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
index 81f0013df..cdd4e5be7 100644
--- a/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
+++ b/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
@@ -10,21 +10,25 @@
                     <button name="action_confirm" string="Confirm" type="object" class="oe_highlight" states="draft"/>
                     <button name="action_refuse" type="object" states="confirm"
                             class="oe_highlight" string="Refuse"/>
-                  <button name="Direct_manager" string="Direct manager" type="object" class="oe_highlight" states="confirm"/>
-
+                    <button name="Direct_manager" string="Direct manager" type="object" class="oe_highlight"
+                            states="confirm"/>
                     <button name="fleet_tool" string="Fleet tool" type="object" class="oe_highlight"
                             states="Direct_manager"/>
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
                     <group>
-                        <group col="4" colspan="2" string="Employee Information">
+                        <group>
                             <field name="from_hr_depart" string="Another Employee"/>
+                        </group>
+                        <group col="4" colspan="2" string="Employee Information">
+
                             <field name="employee_id" string="Employee Name"
                                    attrs="{'readonly': [('from_hr_depart', '=', False)]}"/>
                             <field name="license_number" readonly="1" force_save="1"/>
                             <field name="license_end" readonly="1" force_save="1"/>
                             <field name="custody_id" invisible="1"/>
+                            <field name="name"/>
                         </group>
                         <div class="oe_title">
                             <label for="vehicle_id" class="oe_edit_only"/>
@@ -60,6 +64,16 @@
         </field>
     </record>
 
+    <record id='fleet_request_vehicle_authorization_action_tree' model='ir.ui.view'>
+        <field name="name">fleet.request.vehicle.authorization.tree</field>
+        <field name="model">request.vehicle.authorization</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="start_date"/>
+            </tree>
+        </field>
+    </record>
+
 
     <record id='fleet_request_vehicle_authorization_action' model='ir.actions.act_window'>
         <field name="name">Request vehicle authorization</field>
diff --git a/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml b/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml
index f8e17e3ce..97eae3eb9 100644
--- a/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml
+++ b/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml
@@ -20,7 +20,7 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
-                                <field name="name" attrs="{'readonly': [('state', '!=', 'draft')],'required':True}"/>
+                                <field name="name" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                             </h1>
                             <label for="vehicle_id" class="oe_edit_only"/>
                             <h2>