diff options
| author | jbm-odoo <jbm@odoo.com> | 2019-11-25 12:48:37 +0000 |
|---|---|---|
| committer | jbm-odoo <jbm@odoo.com> | 2019-11-28 10:39:49 +0000 |
| commit | df44538a8b6b34ca71a2374d37e26e5d56f38c5b (patch) | |
| tree | 31152ab4a39169e77be7f0cd1506da8ab1674860 /addons/fleet | |
| parent | 12ce03037546fa13327fae1e08ecaaa78ac05051 (diff) | |
[IMP] fleet: Add analytic account and mobility card
Create analytic account from fleet (and link it to vehicle) based
on the plate and the fiscal deduction rate (if l10n_hr_payroll_fleet
is installed).
Add on employee a Mobility Card number. This number is set on vehicle
when we put a partner linked to employee on a vehicle.
taskID: 2127641
Diffstat (limited to 'addons/fleet')
| -rw-r--r-- | addons/fleet/__init__.py | 1 | ||||
| -rw-r--r-- | addons/fleet/models/fleet_vehicle.py | 4 | ||||
| -rw-r--r-- | addons/fleet/models/res_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/fleet/views/fleet_vehicle_views.xml | 2 | ||||
| -rw-r--r-- | addons/fleet/views/res_config_settings_views.xml | 11 |
5 files changed, 18 insertions, 1 deletions
diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py index 8484f21c236..2609681a938 100644 --- a/addons/fleet/__init__.py +++ b/addons/fleet/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. + from . import models from . import report diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py index c40ead03617..eab2be4834f 100644 --- a/addons/fleet/models/fleet_vehicle.py +++ b/addons/fleet/models/fleet_vehicle.py @@ -158,6 +158,10 @@ class FleetVehicle(models.Model): record.contract_renewal_total = total - 1 # we remove 1 from the real total for display purposes record.contract_renewal_name = name + def _get_analytic_name(self): + # This function is used in fleet_account and is overrided in l10n_be_hr_payroll_fleet + return self.license_plate or _('No plate') + def _search_contract_renewal_due_soon(self, operator, value): params = self.env['ir.config_parameter'].sudo() delay_alert_contract = int(params.get_param('hr_fleet.delay_alert_contract', default=30)) diff --git a/addons/fleet/models/res_config_settings.py b/addons/fleet/models/res_config_settings.py index 6e750044e39..59b725d877b 100644 --- a/addons/fleet/models/res_config_settings.py +++ b/addons/fleet/models/res_config_settings.py @@ -8,3 +8,4 @@ class ResConfigSettings(models.TransientModel): _inherit = ['res.config.settings'] delay_alert_contract = fields.Integer(string='Delay alert contract outdated', default=30, config_parameter='hr_fleet.delay_alert_contract') + module_fleet_account = fields.Boolean(string="Analytic Accounting Fleet") diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml index b685a12ebf8..25c25b2932d 100644 --- a/addons/fleet/views/fleet_vehicle_views.xml +++ b/addons/fleet/views/fleet_vehicle_views.xml @@ -87,7 +87,7 @@ <field name="residual_value" widget="monetary"/> <field name="company_id" groups="base.group_multi_company"/> </group> - <group string="Contract"> + <group string="Contract" name="contract"> <field name="manager_id"/> <field name="first_contract_date"/> </group> diff --git a/addons/fleet/views/res_config_settings_views.xml b/addons/fleet/views/res_config_settings_views.xml index 05c4adf4d42..eddce7ccd0d 100644 --- a/addons/fleet/views/res_config_settings_views.xml +++ b/addons/fleet/views/res_config_settings_views.xml @@ -22,6 +22,17 @@ </div> </div> </div> + <div class="col-12 col-lg-6 o_setting_box"> + <div class="o_setting_left_pane"> + <field name="module_fleet_account" widget="upgrade_boolean"/> + </div> + <div class="o_setting_right_pane"> + <label for="module_fleet_account" string="Analytic Accounting"/> + <div class="text-muted"> + Manage analytic account for vehicle + </div> + </div> + </div> </div> </div> </xpath> |