From b4907dcd84b5273067fda6aca87d7b978cf6ac85 Mon Sep 17 00:00:00 2001
From: Mazen Abdo <one6428300@gmail.com>
Date: Tue, 5 Nov 2024 14:22:14 +0200
Subject: [PATCH] fix Department Manager

---
 ...quest_vehicle_authorization.cpython-38.pyc | Bin 6926 -> 7676 bytes
 .../models/request_vehicle_authorization.py   |  26 +++++++++++++++---
 .../odex_fleet/security/security_view.xml     |  16 ++++++-----
 .../views/request_vehicle_authorization.xml   |   4 +--
 4 files changed, 33 insertions(+), 13 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 e4360c7fd7551fae3c2cbc3f3ca1f28283532b83..acaecd09ca504880b42244475e21d38270eae07d 100644
GIT binary patch
delta 1183
zcma))O>7fK6o7ZuyX&>%7zYw!J3TB?p{xX)`YWndYPgg`DwQIkAhcRM6UUC%8)nyP
z5_an*F(^c(YBh&mDkVMv6%{{`fSx&XMA{vJ#1+b+2M!!K@SZ^=2M%3nzJ2q4=Dm6I
ze*N^-(c;PB;k*K0{P1A?-oD?9k4W#<zp+}RUQe0+oVHIWwlB-#NvXVbF;goNd+XWA
zgene=6pm985l4y0Ch03gIj2ztoYg5_h2w0MABCUXAFwuc+J4xWY1G`X;kTX8cV=3Q
zg&_DXr_TM(y!dZqbk87e0fGVppb(Q7!rJ|Tm>ZqwqNV_A5>|jdl*A-bn#v}jYM;bv
zq&C$!6J?GmXHLahq%||V8j&VSI?Y@rv5wwUt0<cW9mo)A^hq-t=`>4CjA&+O)H<O#
z@XVrj(?lK3|7mvn1TI(|TySWrGX(`C|0K85_2jm7z7sI+v|W$IR@zH$r0eObmD~mK
zs+IheE~jhYcE?JtCVwYalIzJeE4h;P(o0r)AzcG;IbBJvElv28ExhT=kwHs#^vEV%
znR}OIso=Sd))9{dfm>&?u(P*IyWZGBr{;SeYlj_ti}w_B9qUYPJk`L=a{$|vg||mK
z;o>}#`Ji(a1*bu!);;UfMVSRvlhr~wH1G1T4YzL4K<XZp-jW7q0s7|LPB`nM$<Fbw
z@puN1I@TY^{C1=?W_<3sAwPk3qsEyVGX4>6G<3ENZo_7}1ZB<PRh^J|^DS_a`k+HR
z1T)8B*e)IG<hxKmKnbN;KnyFe01DAaffy<b7b&WFqQXvnOO51TE`0@~Uip7hyR|s#
zlc8bC@KV@q@nY<cZz4#-F(3aH@e`tp_!)tt!@oyNBbE^-5vLF<h*j}m@3_u?1X(=a
z`x*I7d^qlqFGO#AZr^!ON^Nr1<s9=!?HD#~M>bI^e_VN&PHI1}g%IDy4g5A=5ogMi
zWLfmfhl;D1YViE$Fwx`k;nHbT)e$%~d{&HA4v>rD%SullHg$84xL>IsUqjO+#5&>^
uL<Vsg(L-$afBO+Oz;F{*fGJI)seD6()$hgz$6dgv!w3_xA(HAR#C{F(gJ$Lc

delta 447
zcmY+-IZpyX6bEnymP3W*5CZH`*eE8_;gL{if-%v?LP<<CAsp+1u!pmoh=^8H77+3Z
zJ4+Kwf*--yTi9$Y?EM5Lnm7*{on(HQdGF2qzw`Yyz8DJ4y4ZT^WYiyd$iI{B==0j`
zJ8&&)P71d8)VS}d^8QCc^K1;vXnY)u5jVU>r5S-$=<&3i@Zzlla%>46;^Np!R!ESq
zDQ214nxfkle5CG#GknoRc99mMAvz4x^Em^LMdS!Ek#mOQFSQI+Rj9)?^izXwV$D~j
zO4(N6Exk@|AS9H?253Tap@B`VP%l%8aSpf5rv8S)myk<OQz!jHrENPt_L*hq)Px<e
zKn%DQS0WfqIh^roMonqKvzVPb!D1Z|fJlp^2N|j72?sbBN$TDOHrmJ~a)o%1E<%y;
ke<FAtFz(s5FfBkhHyuDl-cL-vvv4Ad1dsu|$g3pz3!_zS3IG5A

diff --git a/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py b/odex25_fleet/odex_fleet/models/request_vehicle_authorization.py
index b0a953e09..e19697af5 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")
-    departments_id= fields.Many2one('hr.department')
+    department_id= fields.Many2one('hr.department')
 
 
 
@@ -117,12 +117,30 @@ class RequestVehicleDelegation(models.Model):
             'context': {'default_delegation_id': self.id},
         }
 
-
-
     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} لديك طلب تفويض بحاجة الى موافقة'
+        group = self.env.ref('odex_fleet.group_fleet_tool')
+        users = group.users
+
+        for user in users:
+            if user.partner_id:
+                message_body = message_template.format(user_name=user.name)
+
+                self.env['mail.message'].create({
+                    'message_type': 'notification',
+                    'subtype_id': self.env.ref('mail.mt_comment').id,
+                    'body': message_body,
+                    'subject': 'طلب تفويض جديد',
+                    'partner_ids': [(4, user.partner_id.id)],
+                    'model': 'request.vehicle.authorization',
+                    'res_id': self.id,
+                    'author_id': self.env.user.partner_id.id,
+                })
     def fleet_tool(self):
 
         vehicle_vals = {
@@ -142,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,
-            'departments_id': self.departments_id.id if self.departments_id else False,
+            'department_id': self.department_id.id if self.department_id else False,
             'request_vehicle_authorization': self.id
         }
         _logger.info("Attempting to create vehicle delegation with values: %s", vehicle_vals)
diff --git a/odex25_fleet/odex_fleet/security/security_view.xml b/odex25_fleet/odex_fleet/security/security_view.xml
index d9ca756fd..73b1b709a 100644
--- a/odex25_fleet/odex_fleet/security/security_view.xml
+++ b/odex25_fleet/odex_fleet/security/security_view.xml
@@ -111,13 +111,15 @@
         </record>
 
 
+<record id="request_rule_direct_manager" model="ir.rule">
+    <field name="name">Department Manager</field>
+    <field name="model_id" ref="odex_fleet.model_request_vehicle_authorization"/>
+    <field name="domain_force">[('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
+    <field name="groups" eval="[(4, ref('odex_fleet.group_direct_manager'))]"/>
+</record>
+
+
+
 
-        <record id="request_rule_direct_manager" model="ir.rule">
-            <field name="name">Department Manager</field>
-            <field name="model_id" ref="odex_fleet.model_request_vehicle_authorization"/>
-            <field name="domain_force">[('department_id.manager_id.user_id','in', [user.id])]</field>
-            <field name="groups"
-                   eval="[ (4, ref('odex_fleet.group_direct_manager'))]"/>
-        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml b/odex25_fleet/odex_fleet/views/request_vehicle_authorization.xml
index 1b9bbc359..7cfff9bdc 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="departments_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="department_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="departments_id"/>
+                <field name="department_id"/>
 
             </tree>
         </field>