devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates in fleet

This commit is contained in:
esraa 2024-10-08 15:47:05 +03:00
parent fc7fb82c00
commit af12e73de4
7 changed files with 76 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
odex25_fleet/odex_fleet/i18n/ar_001.po
View File

@ -308,7 +308,8 @@ 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.odex_fleet_vehicle_log_services_view_form
#: model_terms:ir.ui.view,arch_db:odex_fleet.vehicle_infraction_view_form #: model_terms:ir.ui.view,arch_db:odex_fleet.vehicle_infraction_view_form
msgid "Approve" msgid "Approve"
msgstr "" msgstr "اعتماد"
#. module: odex_fleet #. module: odex_fleet
#: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_log_fuel__state__approve #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_log_fuel__state__approve
@ -990,6 +991,16 @@ msgstr "الاسم المعروض"
msgid "Draft" msgid "Draft"
msgstr "مسودة" msgstr "مسودة"
#. module: odex_fleet
#: model:res.groups,name:odex_fleet.fleet_group_draft
#: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_form_renew_view_form
#: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_request_maintenance_view_form
#: model_terms:ir.ui.view,arch_db:odex_fleet.odex_fleet_vehicle_log_fuel_view_form
#: model_terms:ir.ui.view,arch_db:odex_fleet.odex_fleet_vehicle_log_services_view_form
msgid "Set To Draft"
msgstr "إرسال الى مسودة"
#. module: odex_fleet #. module: odex_fleet
#: model:ir.model.fields,field_description:odex_fleet.field_fleet_maintenance__employee_id #: model:ir.model.fields,field_description:odex_fleet.field_fleet_maintenance__employee_id
#: model:ir.model.fields,field_description:odex_fleet.field_fleet_vehicle__driver_id #: model:ir.model.fields,field_description:odex_fleet.field_fleet_vehicle__driver_id
@ -1345,14 +1356,14 @@ msgstr ""
#. module: odex_fleet #. module: odex_fleet
#: model_terms:ir.ui.view,arch_db:odex_fleet.invoice_report_pdf #: model_terms:ir.ui.view,arch_db:odex_fleet.invoice_report_pdf
msgid "From" msgid "From"
msgstr "" msgstr "استمارة"
#. module: odex_fleet #. module: odex_fleet
#: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_account_config__type__fuel #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_account_config__type__fuel
#: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_cost__cost_type__fuel #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_vehicle_cost__cost_type__fuel
#: model_terms:ir.ui.view,arch_db:odex_fleet.car_consumption_cost_report_pdf #: model_terms:ir.ui.view,arch_db:odex_fleet.car_consumption_cost_report_pdf
msgid "Fuel" msgid "Fuel"
msgstr "" msgstr "وقود"
#. module: odex_fleet #. module: odex_fleet
#: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_vehicle_log_fuel_view_tree #: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_vehicle_log_fuel_view_tree
@ -2271,7 +2282,7 @@ msgstr "المالك"
#: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_maintenance__state__paid #: model:ir.model.fields.selection,name:odex_fleet.selection__fleet_maintenance__state__paid
#: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_request_maintenance_view_form #: model_terms:ir.ui.view,arch_db:odex_fleet.fleet_request_maintenance_view_form
msgid "Paid" msgid "Paid"
msgstr "" msgstr "إنشاء فاتورة"
#. module: odex_fleet #. module: odex_fleet
#: model:ir.model.fields,field_description:odex_fleet.field_fleet_vehicle_cost__parent_id #: model:ir.model.fields,field_description:odex_fleet.field_fleet_vehicle_cost__parent_id

3
odex25_fleet/odex_fleet/models/__init__.py
View File

@ -7,4 +7,5 @@ from . import form_renew
from . import account_config from . import account_config
from . import insurance_companies from . import insurance_companies
from . import infractions from . import infractions
from . import driver_departments from . import driver_departments
from . import fleet_service_type

10
odex25_fleet/odex_fleet/models/fleet_service_type.py Normal file
View File

@ -0,0 +1,10 @@
from odoo import models, fields, api, _
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')

2
odex25_fleet/odex_fleet/models/maintenance_request.py
View File

@ -41,7 +41,7 @@ class FleetMaintenance(models.Model):
employee_id = fields.Many2one('hr.employee', string="Driver" ) employee_id = fields.Many2one('hr.employee', string="Driver" )
quotation_ids = fields.One2many('fleet.quotation','request_id',string="Quotations") quotation_ids = fields.One2many('fleet.quotation','request_id',string="Quotations")
service_ids = fields.One2many('fleet.quotation.service','request_id',string="Quotations") service_ids = fields.One2many('fleet.quotation.service','request_id',string="Quotations")
branch_id = fields.Many2one('res.branch', string="Branch", default=lambda self: self.env.user.branch_id ) branch_id = fields.Many2one('hr.department', string="Branch")
# log_id = fields.Many2one('fleet.vehicle.log.services', string="Service Log") # log_id = fields.Many2one('fleet.vehicle.log.services', string="Service Log")
total_cost = fields.Float( string="Total Cost", compute="get_cost",store=True ) total_cost = fields.Float( string="Total Cost", compute="get_cost",store=True )
total1 = fields.Float(string="Total",compute="get_total",store=True ) total1 = fields.Float(string="Total",compute="get_total",store=True )

23
odex25_fleet/odex_fleet/models/vehicle.py
View File

@ -5,15 +5,18 @@ from datetime import timedelta
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
import math import math
class FleetBranch(models.Model): class FleetBranch(models.Model):
_inherit = 'res.branch' _inherit = 'res.branch'
state_id = fields.Many2one('res.country.state', string="State", ) state_id = fields.Many2one('res.country.state', string="State", )
class Partner(models.Model): class Partner(models.Model):
_inherit = 'res.partner' _inherit = 'res.partner'
car_owner = fields.Boolean( string="Car Owner", ) car_owner = fields.Boolean(string="Car Owner", )
class FleetVehicle(models.Model): class FleetVehicle(models.Model):
_inherit = 'fleet.vehicle' _inherit = 'fleet.vehicle'
@ -22,7 +25,7 @@ class FleetVehicle(models.Model):
insurance_companies_id = fields.Many2one('insurance.companies', string="Insurance Companies") insurance_companies_id = fields.Many2one('insurance.companies', string="Insurance Companies")
employee_id = fields.Many2one('hr.employee', string="Driver") employee_id = fields.Many2one('hr.employee', string="Driver")
driver_id = fields.Many2one(related='employee_id.user_id.partner_id', store=True, string="Driver") driver_id = fields.Many2one(related='employee_id.user_id.partner_id', store=True, string="Driver")
branch_id = fields.Many2one('hr.department', string="Branch",) branch_id = fields.Many2one('hr.department', string="Branch", )
states = fields.Many2one('res.country.state', string="State", ) states = fields.Many2one('res.country.state', string="State", )
old_branch_id = fields.Many2one('res.branch', string="Old Branch", ) old_branch_id = fields.Many2one('res.branch', string="Old Branch", )
license_end = fields.Date(string="License End") license_end = fields.Date(string="License End")
@ -307,7 +310,7 @@ class FleetVehicleLogServices(models.Model):
account_id = fields.Many2one('account.account', string="Account") account_id = fields.Many2one('account.account', string="Account")
tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict') tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict')
invoice_id = fields.Many2one('account.move', string="Invoice", copy=False) invoice_id = fields.Many2one('account.move', string="Invoice", copy=False)
partner_id = fields.Many2one('res.partner', string="Service Provider") partner_id = fields.Many2one('res.partner', string="Service Provider", required=1)
request_id = fields.Many2one('fleet.maintenance', string="Maintenance Request") request_id = fields.Many2one('fleet.maintenance', string="Maintenance Request")
state = fields.Selection([ state = fields.Selection([
('draft', 'Draft'), ('draft', 'Draft'),
@ -336,6 +339,13 @@ class FleetVehicleLogServices(models.Model):
default=lambda self: self.env.ref('fleet.type_service_service_8', raise_if_not_found=False), default=lambda self: self.env.ref('fleet.type_service_service_8', raise_if_not_found=False),
) )
def copy(self, default=None):
default = dict(default or {})
default.update({
'status': 'draft',
})
return super(FleetVehicleLogServices, self).copy(default)
@api.onchange('odometer') @api.onchange('odometer')
def onchange_odometer(self): def onchange_odometer(self):
for rec in self: for rec in self:
@ -350,7 +360,7 @@ class FleetVehicleLogServices(models.Model):
def set_to_draft(self): def set_to_draft(self):
for rec in self: for rec in self:
rec.state = 'draft' rec.status = 'draft'
def action_confirm(self): def action_confirm(self):
self.sudo().status = 'confirm' self.sudo().status = 'confirm'
@ -443,7 +453,8 @@ class FleetVehicleLogFuel(models.Model):
print("pass") print("pass")
# pass # pass
else: else:
raise ValidationError(_("You Need To Configurate Account Details")) pass
# raise ValidationError(_("You Need To Configurate Account Details"))
return res return res
liter = fields.Float() liter = fields.Float()

4
odex25_fleet/odex_fleet/views/driver_departments.xml
View File

@ -49,7 +49,7 @@
</p> </p>
</field> </field>
</record> </record>
<!-- <menuitem name="Departments" parent="fleet.menu_root" id="vehicles_infractions" sequence="2"/>--> <!-- <menuitem name="Departments" parent="fleet.menu_root" id="vehicles_infractions" sequence="2" active="False"/>-->
<menuitem action="driver_department_action" name="Departments" parent="fleet.fleet_configuration" id="driver_department_menu"/> <!-- <menuitem action="driver_department_action" name="Departments" parent="fleet.fleet_configuration" id="driver_department_menu"/>-->
</data> </data>
</odoo> </odoo>

39
odex25_fleet/odex_fleet/views/vehicle_view.xml
View File

@ -179,7 +179,8 @@
</field> </field>
</record> </record>
<!-- <menuitem action="fleet_vehicle_costs_action" parent="fleet.fleet_vehicles" id="fleet_vehicle_costs_menu" groups="fleet.fleet_group_manager"/>--> <menuitem action="fleet_vehicle_costs_action" parent="fleet.fleet_vehicles" id="fleet_vehicle_costs_menu"
groups="fleet.fleet_group_manager"/>
<record model="ir.ui.view" id="odex_view_fleet_vehicle_form"> <record model="ir.ui.view" id="odex_view_fleet_vehicle_form">
@ -246,7 +247,7 @@
<field name="vehicle_type" invisible="1"/> <field name="vehicle_type" invisible="1"/>
<field name="states"/> <field name="states"/>
<field name="branch_id"/> <field name="branch_id"/>
<!-- <field name="owner_id" domain="[('car_owner','=',True)]" required="1"/>--> <field name="owner_id" domain="[('car_owner','=',True)]"/>
<field name="fleet_type_id" readonly="1"/> <field name="fleet_type_id" readonly="1"/>
<field name="car_category"/> <field name="car_category"/>
<field name="man_company" readonly="1"/> <field name="man_company" readonly="1"/>
@ -397,11 +398,13 @@
name="Vehicle Type" parent="fleet.fleet_configuration" id="fleet_type_menu" sequence="100" name="Vehicle Type" parent="fleet.fleet_configuration" id="fleet_type_menu" sequence="100"
groups="fleet.fleet_group_user"/> groups="fleet.fleet_group_user"/>
<!-- <menuitem id="res_states_menu" name="States" sequence="1"--> <menuitem id="res_states_menu" name="States" sequence="1"
<!-- parent="fleet.fleet_configuration" groups="fleet.fleet_group_user,fleet_group_hr_officer" action="base.action_country_state" />--> parent="fleet.fleet_configuration" groups="fleet.fleet_group_user,fleet_group_hr_officer"
action="base.action_country_state"/>
<!-- <menuitem id="res_branches_menu" name="Branch"--> <menuitem id="res_branches_menu" name="Branch"
<!-- parent="fleet.fleet_configuration" groups="fleet_group_supervisor,fleet_group_hr_officer" action="branch.branch_action_res_branch" sequence="2"/>--> parent="fleet.fleet_configuration" groups="fleet_group_supervisor,fleet_group_hr_officer"
action="branch.branch_action_res_branch" sequence="2"/>
<!-- fuel type--> <!-- fuel type-->
<record id='fleet_fuel_price_view_form' model='ir.ui.view'> <record id='fleet_fuel_price_view_form' model='ir.ui.view'>
@ -543,8 +546,9 @@
</field> </field>
</record> </record>
<!-- <menuitem action="man_company_action"--> <menuitem action="man_company_action"
<!-- name="Manufacture Company" parent="fleet.fleet_configuration" id="man_company_menu" groups="fleet.fleet_group_user" sequence="101"/>--> name="Manufacture Company" parent="fleet.fleet_configuration" id="man_company_menu"
groups="fleet.fleet_group_user" sequence="101"/>
<!-- Transmission Type --> <!-- Transmission Type -->
<record id='fleet_transmission_view_form' model='ir.ui.view'> <record id='fleet_transmission_view_form' model='ir.ui.view'>
<field name="name">fleet.vehicle.transmission.setting.model.form</field> <field name="name">fleet.vehicle.transmission.setting.model.form</field>
@ -653,7 +657,8 @@
</record> </record>
<!-- --> <!-- -->
<!-- <menuitem action="action_partner_owner_form" groups="fleet.fleet_group_user" parent="fleet.fleet_vehicles" sequence="3" id="fleet_vehicle_owner_menu"/>--> <menuitem action="action_partner_owner_form" groups="fleet.fleet_group_user" parent="fleet.fleet_vehicles"
sequence="3" id="fleet_vehicle_owner_menu"/>
<!-- --> <!-- -->
<menuitem action="fleet.fleet_vehicle_action" parent="fleet.fleet_vehicles" id="fleet.fleet_vehicle_menu" <menuitem action="fleet.fleet_vehicle_action" parent="fleet.fleet_vehicles" id="fleet.fleet_vehicle_menu"
groups="fleet.fleet_group_user" sequence="2"/> groups="fleet.fleet_group_user" sequence="2"/>
@ -746,7 +751,7 @@
<tree string="Fuel Logs"> <tree string="Fuel Logs">
<field name="date"/> <field name="date"/>
<field name="vehicle_id"/> <field name="vehicle_id"/>
<field name="purchaser_id"/> <field name="employee_id"/>
<field name="inv_ref" invisible="1"/> <field name="inv_ref" invisible="1"/>
<field name="vendor_id" invisible="1"/> <field name="vendor_id" invisible="1"/>
<field name="odometer"/> <field name="odometer"/>
@ -881,6 +886,17 @@
<field name="inv_ref" position="after"> <field name="inv_ref" position="after">
<field name="state"/> <field name="state"/>
</field> </field>
<field name="purchaser_id" position="replace">
<field name="employee_id"/>
</field>
<field name="service_type_id" position="replace">
<field name="cost_subtype_id"/>
</field>
<field name="vendor_id" position="replace">
<field name="partner_id"/>
</field>
</field> </field>
</record> </record>
@ -892,6 +908,9 @@
<menuitem action="fleet.fleet_vehicle_model_brand_action" groups="fleet.fleet_group_user" <menuitem action="fleet.fleet_vehicle_model_brand_action" groups="fleet.fleet_group_user"
parent="fleet.fleet_configuration" id="fleet.fleet_vehicle_model_brand_menu" sequence="2"/> parent="fleet.fleet_configuration" id="fleet.fleet_vehicle_model_brand_menu" sequence="2"/>
<menuitem action="fleet.fleet_vehicle_log_contract_action" parent="fleet.fleet_vehicles"
id="fleet.fleet_vehicle_log_contract_menu" groups="fleet.fleet_group_user,fleet_group_hr_officer"
active="False"/>
<menuitem action="fleet.fleet_vehicle_service_types_action" parent="fleet.fleet_configuration" <menuitem action="fleet.fleet_vehicle_service_types_action" parent="fleet.fleet_configuration"
groups="fleet.fleet_group_user" id="fleet.fleet_vehicle_service_types_menu" sequence="3"/> groups="fleet.fleet_group_user" id="fleet.fleet_vehicle_service_types_menu" sequence="3"/>
<menuitem id="fleet.fleet_vehicle_tag_menu" parent="fleet.fleet_configuration" <menuitem id="fleet.fleet_vehicle_tag_menu" parent="fleet.fleet_configuration"