diff options
| author | william <wan@odoo.com> | 2020-05-26 08:41:55 +0000 |
|---|---|---|
| committer | wan <wan@odoo.com> | 2020-08-19 14:22:48 +0000 |
| commit | d1c0a97c188d205df3f0896c760abafee406ebb1 (patch) | |
| tree | 40b60529f129ceb673fd025c5770369c54e78a08 | |
| parent | db9da432b7aedcd1bc944e23e59459c9c92801b7 (diff) | |
[ADD] account_fleet: manage accounting with fleet
Task: 2186429
Add a vehicle on account.move.line to help create reports.
When a vehicle is set, log a service log on the vehicle.
closes odoo/odoo#49675
Related: odoo/upgrade#1357
Related: odoo/enterprise#8480
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
| -rw-r--r-- | addons/account_fleet/__init__.py | 4 | ||||
| -rw-r--r-- | addons/account_fleet/__manifest__.py | 19 | ||||
| -rw-r--r-- | addons/account_fleet/data/fleet_service_type_data.xml | 7 | ||||
| -rw-r--r-- | addons/account_fleet/models/__init__.py | 5 | ||||
| -rw-r--r-- | addons/account_fleet/models/account_move.py | 47 | ||||
| -rw-r--r-- | addons/account_fleet/models/fleet_vehicle.py | 35 | ||||
| -rw-r--r-- | addons/account_fleet/views/account_move_views.xml | 18 | ||||
| -rw-r--r-- | addons/account_fleet/views/fleet_vehicle_views.xml | 20 |
8 files changed, 155 insertions, 0 deletions
diff --git a/addons/account_fleet/__init__.py b/addons/account_fleet/__init__.py new file mode 100644 index 00000000000..dc5e6b693d1 --- /dev/null +++ b/addons/account_fleet/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import models diff --git a/addons/account_fleet/__manifest__.py b/addons/account_fleet/__manifest__.py new file mode 100644 index 00000000000..dc8acc4097e --- /dev/null +++ b/addons/account_fleet/__manifest__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. +{ + 'name': 'Accounting/Fleet bridge', + 'category': 'Accounting/Accounting', + 'summary': 'Manage accounting with fleets', + 'description': "", + 'version': '1.0', + 'depends': ['fleet', 'account'], + 'data': [ + 'data/fleet_service_type_data.xml', + 'views/account_move_views.xml', + 'views/fleet_vehicle_views.xml', + ], + 'installable': True, + 'auto_install': True, + 'application': False, + 'license': 'OEEL-1', +} diff --git a/addons/account_fleet/data/fleet_service_type_data.xml b/addons/account_fleet/data/fleet_service_type_data.xml new file mode 100644 index 00000000000..baeb520b44f --- /dev/null +++ b/addons/account_fleet/data/fleet_service_type_data.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + <record id="data_fleet_service_type_vendor_bill" model="fleet.service.type"> + <field name="name">Vendor Bill</field> + <field name="category">service</field> + </record> +</odoo> diff --git a/addons/account_fleet/models/__init__.py b/addons/account_fleet/models/__init__.py new file mode 100644 index 00000000000..7e3c6e70081 --- /dev/null +++ b/addons/account_fleet/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import account_move +from . import fleet_vehicle diff --git a/addons/account_fleet/models/account_move.py b/addons/account_fleet/models/account_move.py new file mode 100644 index 00000000000..33cda7efd4b --- /dev/null +++ b/addons/account_fleet/models/account_move.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models, fields, api, _ + + +class AccountMove(models.Model): + _inherit = 'account.move' + + def _post(self, soft=True): + vendor_bill_service = self.env.ref('account_fleet.data_fleet_service_type_vendor_bill', raise_if_not_found=False) + if not vendor_bill_service: + return super()._post(soft) + + val_list = [] + log_list = [] + not_posted_before = self.filtered(lambda r: not r.posted_before) + posted = super()._post(soft) # We need the move name to be set, but we also need to know which move are posted for the first time. + for line in (not_posted_before & posted).line_ids.filtered(lambda ml: ml.vehicle_id): + val = { + 'service_type_id': vendor_bill_service.id, + 'vehicle_id': line.vehicle_id.id, + 'amount': line.price_subtotal, + 'vendor_id': line.partner_id.id, + 'description': line.name, + } + log = _('Service Vendor Bill: <a href=# data-oe-model=account.move data-oe-id={move_id}>{move_name}</a>').format( + move_id=line.move_id.id, + move_name=line.move_id.name, + ) + val_list.append(val) + log_list.append(log) + log_service_ids = self.env['fleet.vehicle.log.services'].create(val_list) + for log_service_id, log in zip(log_service_ids, log_list): + log_service_id.message_post(body=log) + return posted + + +class AccountMoveLine(models.Model): + _inherit = 'account.move.line' + + vehicle_id = fields.Many2one('fleet.vehicle', string='Vehicle') + need_vehicle = fields.Boolean(compute='_compute_need_vehicle', + help="Technical field to decide whether the vehicle_id field is editable") + + def _compute_need_vehicle(self): + self.need_vehicle = False diff --git a/addons/account_fleet/models/fleet_vehicle.py b/addons/account_fleet/models/fleet_vehicle.py new file mode 100644 index 00000000000..1bd640b763c --- /dev/null +++ b/addons/account_fleet/models/fleet_vehicle.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models, fields + + +class FleetVehicle(models.Model): + _inherit = 'fleet.vehicle' + + bill_count = fields.Integer(compute='_compute_move_ids', string="Bills Count") + account_move_ids = fields.One2many('account.move', compute='_compute_move_ids') + + def _compute_move_ids(self): + if not self.env.user.has_group('account.group_account_readonly'): + self.account_move_ids = False + self.bill_count = 0 + return + + for vehicle in self: + vehicle.account_move_ids = self.env['account.move.line'].search([('vehicle_id', '=', self.id), ('move_id.state', '!=', 'cancel')]).move_id + vehicle.bill_count = len(vehicle.account_move_ids) + + def action_view_bills(self): + self.ensure_one() + + form_view_ref = self.env.ref('account.view_move_form', False) + tree_view_ref = self.env.ref('account.view_move_tree', False) + + action = self.env.ref('account.action_move_in_invoice_type') + result = action.read()[0] + result.update({ + 'domain': [('id', 'in', self.account_move_ids.ids)], + 'views': [(tree_view_ref.id, 'tree'), (form_view_ref.id, 'form')], + }) + return result diff --git a/addons/account_fleet/views/account_move_views.xml b/addons/account_fleet/views/account_move_views.xml new file mode 100644 index 00000000000..eb7a1d3cd0e --- /dev/null +++ b/addons/account_fleet/views/account_move_views.xml @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='utf-8'?> +<odoo> + <record id="view_move_form" model="ir.ui.view"> + <field name="name">account.move.form</field> + <field name="model">account.move</field> + <field name="inherit_id" ref="account.view_move_form"/> + <field name="arch" type="xml"> + <xpath expr="//field[@name='line_ids']//field[@name='account_id']" position="after"> + <field name='need_vehicle' invisible='1'/> + <field name='vehicle_id' attrs="{'required': [('need_vehicle', '=', True), ('parent.move_type', '=', 'in_invoice')], 'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}" optional='hidden'/> + </xpath> + <xpath expr="//field[@name='invoice_line_ids']//field[@name='account_id']" position="after"> + <field name='need_vehicle' invisible='1'/> + <field name='vehicle_id' attrs="{'required': [('need_vehicle', '=', True), ('parent.move_type', '=', 'in_invoice')], 'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}" optional='hidden'/> + </xpath> + </field> + </record> +</odoo> diff --git a/addons/account_fleet/views/fleet_vehicle_views.xml b/addons/account_fleet/views/fleet_vehicle_views.xml new file mode 100644 index 00000000000..92a5a8dd4cd --- /dev/null +++ b/addons/account_fleet/views/fleet_vehicle_views.xml @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='utf-8'?> +<odoo> + <record id="fleet_vehicle_view_form" model="ir.ui.view"> + <field name="name">fleet.vehicle.form</field> + <field name="model">fleet.vehicle</field> + <field name="inherit_id" ref="fleet.fleet_vehicle_view_form"/> + <field name="arch" type="xml"> + <xpath expr="//button[@name='open_assignation_logs']" position='before'> + <button name="action_view_bills" + type="object" + class="oe_stat_button" + icon="fa-pencil-square-o" + attrs="{'invisible': [('bill_count', '=', 0)]}" + help="show the vendor bills for this vehicle"> + <field name="bill_count" widget="statinfo" string="Bills"/> + </button> + </xpath> + </field> + </record> +</odoo> |
