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 acaecd09c..48da95b81 100644 Binary files a/odex25_fleet/odex_fleet/models/__pycache__/request_vehicle_authorization.cpython-38.pyc and b/odex25_fleet/odex_fleet/models/__pycache__/request_vehicle_authorization.cpython-38.pyc differ 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 0345844cf..02d4e1e9d 100644 Binary files a/odex25_fleet/odex_fleet/models/__pycache__/vehicle_deleation.cpython-38.pyc and b/odex25_fleet/odex_fleet/models/__pycache__/vehicle_deleation.cpython-38.pyc differ 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 @@ - +