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 c12572788..5483403b6 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/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 @@