diff --git a/odex25_fleet/odex_fleet/i18n/ar_001.po b/odex25_fleet/odex_fleet/i18n/ar_001.po index 3da4d7678..097f8f4f1 100644 --- a/odex25_fleet/odex_fleet/i18n/ar_001.po +++ b/odex25_fleet/odex_fleet/i18n/ar_001.po @@ -1709,7 +1709,7 @@ msgstr "تقرير الفاتورة" #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_log_fuel__state__invoiced #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_log_services__status__invoiced msgid "Invoiced" -msgstr "" +msgstr "مفوتر" #. module: odex_fleet #: model:ir.model.fields,field_description:odex_fleet.field_hr_employee__driver @@ -2412,7 +2412,7 @@ msgstr "بيانات تعبئة الوقود" #: model_terms:ir.ui.view,arch_db:odex_fleet.odex_fleet_vehicle_log_services_view_form #: model_terms:ir.ui.view,arch_db:odex_fleet.vehicle_infraction_view_form msgid "Refuse" -msgstr "" +msgstr "رفض" #. module: odex_fleet #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_log_fuel__state__refused @@ -2421,7 +2421,7 @@ msgstr "" #: model:ir.model.fields.selection,name:odex_fleet.selection__vehicle_delegation__state__refused #: model:ir.model.fields.selection,name:odex_fleet.selection__vehicle_infraction__state__refused msgid "Refused" -msgstr "رفض" +msgstr "مرفوض" #. module: odex_fleet #: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_request_maintenance_view_form diff --git a/odex25_fleet/odex_fleet/models/fleet_service_type.py b/odex25_fleet/odex_fleet/models/fleet_service_type.py index 02e3d0335..1a99c3543 100644 --- a/odex25_fleet/odex_fleet/models/fleet_service_type.py +++ b/odex25_fleet/odex_fleet/models/fleet_service_type.py @@ -1,10 +1,14 @@ from odoo import models, fields, api, _ +from odoo.api import returns class FleetServiceType(models.Model): _inherit = 'fleet.service.type' _description = 'Fleet Service Type' - category = fields.Selection([ - ('service', 'Service') - ], 'Category', required=True, help='Choose whether the service refer to contracts, vehicle services or both') + category = fields.Selection(selection='get_new_category_selection', string='Category', required=True, + help='Choose whether the service refer to contracts, vehicle services or both') + + def get_new_category_selection(self): + selection = [('service', 'Service')] + return selection diff --git a/odex25_fleet/odex_fleet/models/maintenance_request.py b/odex25_fleet/odex_fleet/models/maintenance_request.py index 8765ca2b4..c493035ef 100644 --- a/odex25_fleet/odex_fleet/models/maintenance_request.py +++ b/odex25_fleet/odex_fleet/models/maintenance_request.py @@ -27,36 +27,36 @@ class FleetMaintenance(models.Model): date = fields.Date(string=" Request Date", default=fields.Date.context_today) next_odometer = fields.Float(string="Next Odometer") odometer = fields.Float(string="Odometer") - type = fields.Selection([('corrective', 'Corrective'), ('preventive', 'Preventive')], string='Maintenance Type', default="corrective") - state = fields.Selection([('draft', 'Draft'), + type = fields.Selection([('corrective', 'Corrective'), ('preventive', 'Preventive')], string='Maintenance Type', + default="corrective") + state = fields.Selection([('draft', 'Draft'), ('confirm', 'Confirm'), ('approve', 'Approve'), ('paid', 'Paid'), ('refused', 'Refuse'), ('cancel', 'Cancel'), - ], string='state', default="draft") + ], string='state', default="draft") vehicle_id = fields.Many2one('fleet.vehicle', string="Vehicle") - license_plate = fields.Char(required=True, related='vehicle_id.license_plate', store=True, - ) - employee_id = fields.Many2one('hr.employee', string="Driver" ) - quotation_ids = fields.One2many('fleet.quotation','request_id',string="Quotations") - service_ids = fields.One2many('fleet.quotation.service','request_id',string="Quotations") + license_plate = fields.Char(required=True, related='vehicle_id.license_plate') + employee_id = fields.Many2one('hr.employee', string="Driver") + quotation_ids = fields.One2many('fleet.quotation', 'request_id', string="Quotations") + service_ids = fields.One2many('fleet.quotation.service', 'request_id', string="Quotations") branch_id = fields.Many2one('hr.department', string="Branch") # log_id = fields.Many2one('fleet.vehicle.log.services', string="Service Log") - total_cost = fields.Float( string="Total Cost", compute="get_cost",store=True ) - total1 = fields.Float(string="Total",compute="get_total",store=True ) + total_cost = fields.Float(string="Total Cost", compute="get_cost", store=True) + total1 = fields.Float(string="Total", compute="get_total", store=True) account_id = fields.Many2one('account.account', string="Account") invoice_id = fields.Many2one('account.move', string="Invoice", copy=False) line_id = fields.Many2one('fleet.service.line.config', string="Line", copy=False) - reason = fields.Text(string="Reject Reason", tracking=True,) + reason = fields.Text(string="Reject Reason", tracking=True, ) tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict') user_id = fields.Many2one('res.users', string='Responsible', required=False, default=lambda self: self.env.user) - edit_access = fields.Boolean(compute="get_access",) + edit_access = fields.Boolean(compute="get_access", ) def get_access(self): for rec in self: rec.edit_access = False - if rec.state == 'approve' and self.env.user.has_group('odex_fleet.fleet_group_account'): + if rec.state == 'approve' and self.env.user.has_group('odex_fleet.fleet_group_account'): rec.edit_access = True @api.depends('service_ids') @@ -67,10 +67,10 @@ class FleetMaintenance(models.Model): def create_invoice(self): - partner = self.quotation_ids.filtered(lambda r:r.approve == True).mapped('partner_id') + partner = self.quotation_ids.filtered(lambda r: r.approve == True).mapped('partner_id') if not partner: raise ValidationError(_("You NEED To ADD And Approve Quotation Lines")) - amount = sum(self.quotation_ids.filtered(lambda r:r.approve == True).mapped('cost')) + amount = sum(self.quotation_ids.filtered(lambda r: r.approve == True).mapped('cost')) invoice = self.env['account.move'].sudo().create({ 'partner_id': partner[0].id, 'currency_id': self.env.user.company_id.currency_id.id, @@ -125,7 +125,6 @@ class FleetMaintenance(models.Model): rec.state = 'approve' rec.vehicle_id.next_request_date = rec.next_request_date - def action_refuse(self): for rec in self: rec.state = 'refused' @@ -162,7 +161,6 @@ class FleetQuotation(models.Model): if rec.state == 'approve' and self.env.user.has_group('odex_fleet.fleet_group_account'): rec.edit_access = True - def action_approve(self): rec = self.request_id.quotation_ids.filtered(lambda r: r.approve) print("YYYYYYYYYYYY", rec) @@ -199,6 +197,3 @@ class FleetQuotationService(models.Model): def _compute_total(self): for r in self: r.total = r.number * r.qty - - - diff --git a/odex25_fleet/odex_fleet/views/maintenance_request_view.xml b/odex25_fleet/odex_fleet/views/maintenance_request_view.xml index 3e82ee601..0f38b012e 100644 --- a/odex25_fleet/odex_fleet/views/maintenance_request_view.xml +++ b/odex25_fleet/odex_fleet/views/maintenance_request_view.xml @@ -12,7 +12,7 @@