From 1d2d145d9b44eef1e63c8bed13eb9a525e291ccd Mon Sep 17 00:00:00 2001
From: Mazen Abdo <one6428300@gmail.com>
Date: Wed, 6 Nov 2024 10:28:32 +0200
Subject: [PATCH 1/2] fix2 Department Manager

---
 ...quest_vehicle_authorization.cpython-38.pyc | Bin 7676 -> 7666 bytes
 .../vehicle_deleation.cpython-38.pyc          | Bin 8956 -> 8979 bytes
 .../models/request_vehicle_authorization.py   |   9 +++++----
 .../odex_fleet/models/vehicle_deleation.py    |   2 +-
 .../views/request_vehicle_authorization.xml   |   4 ++--
 5 files changed, 8 insertions(+), 7 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 acaecd09ca504880b42244475e21d38270eae07d..48da95b815501332350c363a5d85686953f441cf 100644
GIT binary patch
delta 459
zcmexk{mGg)l$V!_0SJ`Ew9=Pu<b5K@zLK%X8YnQiKu}~ej}Rl%<coqboKirMqG*V)
zC@Y9pF<Dkfee*JrKt|~*Nx#%`g~Za5jQpa^s>G7a{5*xC)WXu#;*!Z?VkwMildHvQ
znQp00b`)2g{8y}*ans~R@m1^$3&a*OFfvTml32~gnUY$NSTy;*M7y?lkq5{!br2B@
zB5FZI9f<G*5%nOV0Yo%To+v3S+5}>Tf`|wZ(F`J5ChwF~WGbqjd|lFt(P*-elrakj
zW0mq`2R_Nk2~rh`H9$qTSe!Ewi@>JeVsS|<Nkz6}@=qxf$p(;7jbNoAsTC!+*osmU
zi}Uk}nkTzSJ2N&-?vmDFY?-`W+Dae>q%s3UfCH*}Goy?+qgN+LpbJEFgNR-b!3-k$
zKtwBu;726{K->jDVj~b2vj7PWMi!=`1(TCx{YAmXwE@M7bU_3Mh*&WBn5-$I767!y
Ba76$B

delta 508
zcmYk&-z$Sr7zgn4yk2X`tFU*!hvkBaC`y?NWf$B`%(O^a?QOeYIGb9tv0uXC>iGl4
zofaX5D}RC;sdu|^<HDVCDHqPO3psT@ozC-pdfxYZd4If0P*GZ#SlQS9=;N*O-Y$E9
zdvVxgxohnJY0xQZ8RlcF9a)G#2G&>x&fuH@+m<6Nz&w(l+eOABiLNK}0B*IbDqW<+
zP8b9Xj9`FtA5OK|?h>YX=-#2a{!lCF7d?8lmaiSv%KCkeeyLxJ!!^FC5zx?Q&NlOy
zNaBaN2vuCSRI$riZBZiHR+uL@v^YLn4+CaCBQm^?2oM<}OUx2`#6FQD{KNvWOyr3m
z5h4mi5ie|Re723l2pa68Qo5Hu9hdAW_pYed<>^?MH^$UuUpT4#ABLayG27p?y1b~R
zl63>u!imi|FW{tO8uFNP3_=mF924pa&5IKBB#po2E*x@M(d7K@KBBv0qD-6+O~fft
mqFiT19B;%<$O0qC60cy$HK#Uu4=6W87>SDLu;7cU3p~Gw$bqc@

diff --git a/odex25_fleet/odex_fleet/models/__pycache__/vehicle_deleation.cpython-38.pyc b/odex25_fleet/odex_fleet/models/__pycache__/vehicle_deleation.cpython-38.pyc
index 0345844cfa11be510e4023655130f69c7b6e0434..02d4e1e9d6b8d792c2ff5465840594ac4842da8a 100644
GIT binary patch
delta 362
zcmX}m%Q6E|5C-7sNl-~@sw`AlSP%;fC9Xl-uki+|Vvq>`$VCtl;ueF<3#embm)R*h
zm6aFq7Q6rpJ-wK-`K!M^r~CXR)rPTY7-5Z1y?Zbhe>T3U>*M!_?Dl2|5tqy%E7lxF
z$|Y>UbhHMUBfe~7M`YBOU8F_Ee92%>WLzYReOJc;AT|LDhmK~(xi^Uva>%2AqT7Ze
zl@4^+Q|!|sy4>)3I*xJTz2=`Jr0@Oh6lIw>Ba&x1Lq%j3=cw|IIb7h9a~?HZaW3E*
zH=K*O#U1Ao>bU1zwqnH<*m!WXK3=gZ<s+VC*qT%gI8v>*g29&_O155mYZNg<u*%s=
WHB*4<jK0yk`izzW6ecy$|Md?mcz47A

delta 341
zcmX|*NlpS`5QX_WvLR_NV2r`U#6>$RjyUTLOt78xYeB>TC!AZQFJRgO&|$;Ya1WQ>
zLNA~Ti%O(6FYkL*sTVH)F4-%#oruX)i{07ytNmpX??2zhcPc$(BEu?f5GxzE*ZU`H
ztSjkjk_|SM^f$>C+e!wM?64bI?18dDJobZ_J0#gK8M5R!ARom!q@Wukp5s?i3N2k~
z#1=;!H)1I>Dm10_PB_(*F(o-ET;xp2IOkl*n+Yzt5}l;PwdfQ#+=`~T<6d-{2OdRd
xJSRVk&y!xa&#8UpMeV%0GJ(2<dTYyDn^~+^J4z<(O4dv*{74pz6{b5s{{YsWa*+T4

diff --git a/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py b/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
index e19697af5..26577677a 100644
--- a/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
+++ b/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
@@ -49,7 +49,7 @@ class RequestVehicleDelegation(models.Model):
     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',tracking=True)
     from_hr_depart = fields.Boolean()
     name = fields.Char(string="Name")
-    department_id= fields.Many2one('hr.department')
+    depart_id= fields.Many2one('hr.department')
 
 
 
@@ -120,7 +120,7 @@ class RequestVehicleDelegation(models.Model):
     def direct_manager(self):
         for rec in self:
             rec.state = 'direct_manager'
-            rec.send_notification_to_fleet_tool_group()
+
 
     def send_notification_to_fleet_tool_group(self):
         message_template = 'عزيز {user_name} لديك طلب تفويض بحاجة الى موافقة'
@@ -135,7 +135,7 @@ class RequestVehicleDelegation(models.Model):
                     'message_type': 'notification',
                     'subtype_id': self.env.ref('mail.mt_comment').id,
                     'body': message_body,
-                    'subject': 'طلب تفويض جديد',
+                    'subject': 'New authorization request',
                     'partner_ids': [(4, user.partner_id.id)],
                     'model': 'request.vehicle.authorization',
                     'res_id': self.id,
@@ -160,7 +160,7 @@ class RequestVehicleDelegation(models.Model):
             '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,
-            'department_id': self.department_id.id if self.department_id else False,
+            'depart_id': self.depart_id.id if self.depart_id else False,
             'request_vehicle_authorization': self.id
         }
         _logger.info("Attempting to create vehicle delegation with values: %s", vehicle_vals)
@@ -169,6 +169,7 @@ class RequestVehicleDelegation(models.Model):
         _logger.info("Created vehicle delegation: %s", vehicle)
 
         self.state = "fleet_tool"
+        self.send_notification_to_fleet_tool_group()
         return vehicle
 
 
diff --git a/odex25_fleet/odex_fleet/models/vehicle_deleation.py b/odex25_fleet/odex_fleet/models/vehicle_deleation.py
index 34423f3ff..f0c4d6266 100644
--- a/odex25_fleet/odex_fleet/models/vehicle_deleation.py
+++ b/odex25_fleet/odex_fleet/models/vehicle_deleation.py
@@ -52,7 +52,7 @@ class VehicleDelegation(models.Model):
     last_department_id = fields.Many2one(related='vehicle_id.department_id', string="Last Department",help='The last Department the vehicle was authorized for')
     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')
-
+    depart_id= fields.Many2one('hr.department')
     @api.depends("vehicle_id")
     def get_first_odometer(self):
         for rec in self :
diff --git a/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml b/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
index 7cfff9bdc..d3cbd81f7 100644
--- a/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
+++ b/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
@@ -39,7 +39,7 @@
                             <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="department_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="depart_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                         </group>
                         <div class="oe_title">
                             <label for="vehicle_id" class="oe_edit_only"/>
@@ -84,7 +84,7 @@
             <tree>
                 <field name="employee_id"/>
                 <field name="vehicle_id"/>
-                <field name="department_id"/>
+                <field name="depart_id"/>
 
             </tree>
         </field>

From 538a2b3393eca5820d3def93a76add9b071603b4 Mon Sep 17 00:00:00 2001
From: Mazen Abdo <one6428300@gmail.com>
Date: Wed, 6 Nov 2024 12:39:48 +0200
Subject: [PATCH 2/2] fix3 Department

---
 odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml b/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml
index e03f72be8..08a504ef4 100644
--- a/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml
+++ b/odex25_fleet/odex_fleet/views/vehicle_deleation_view.xml
@@ -48,7 +48,7 @@
                             <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="departments_id" attrs="{'invisible': [('departments_id', '=', False)]}"/>
+                             <field name="depart_id" attrs="{'invisible': [('departments_id', '=', False)]}"/>
                         </group>
                         <group  col="4" colspan="2" string="delegated entity" attrs="{'invisible': [('delegation_type', '!=', 'branch')]}">
 <!--                            <field name="state_id" attrs="{'readonly': [('state', '!=', 'draft')],'required':[('delegation_type', '=', 'branch')]}" />-->