diff --git a/addons/fleet/__manifest__.py b/addons/fleet/__manifest__.py
index 74a3eb16c0e..623f655e995 100644
--- a/addons/fleet/__manifest__.py
+++ b/addons/fleet/__manifest__.py
@@ -31,7 +31,9 @@ Main Features
'data': [
'security/fleet_security.xml',
'security/ir.model.access.csv',
- 'views/fleet_view.xml',
+ 'views/fleet_vehicle_model_views.xml',
+ 'views/fleet_vehicle_views.xml',
+ 'views/fleet_vehicle_cost_views.xml',
'views/fleet_board_view.xml',
'data/fleet_cars_data.xml',
'data/fleet_data.xml',
diff --git a/addons/fleet/models/__init__.py b/addons/fleet/models/__init__.py
index da96d13235c..9ed0370b3f4 100644
--- a/addons/fleet/models/__init__.py
+++ b/addons/fleet/models/__init__.py
@@ -1 +1,6 @@
-import fleet
\ No newline at end of file
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import fleet_vehicle
+import fleet_vehicle_cost
+import fleet_vehicle_model
diff --git a/addons/fleet/models/fleet.py b/addons/fleet/models/fleet.py
deleted file mode 100644
index 3dfd4538990..00000000000
--- a/addons/fleet/models/fleet.py
+++ /dev/null
@@ -1,658 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from dateutil.relativedelta import relativedelta
-
-from odoo import api, fields, models, tools, _
-from odoo.exceptions import UserError
-
-
-class FleetVehicleCost(models.Model):
- _name = 'fleet.vehicle.cost'
- _description = 'Cost related to a vehicle'
- _order = 'date desc, vehicle_id asc'
-
- name = fields.Char(related='vehicle_id.name', string='Name', store=True)
- vehicle_id = fields.Many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log')
- cost_subtype_id = fields.Many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost')
- amount = fields.Float('Total Price')
- cost_type = fields.Selection([('contract', 'Contract'), ('services', 'Services'), ('fuel', 'Fuel'), ('other', 'Other')],
- 'Category of the cost', default="other", help='For internal purpose only', required=True)
- parent_id = fields.Many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost')
- cost_ids = fields.One2many('fleet.vehicle.cost', 'parent_id', 'Included Services')
- odometer_id = fields.Many2one('fleet.vehicle.odometer', 'Odometer', help='Odometer measure of the vehicle at the moment of this log')
- odometer = fields.Float(compute="_get_odometer", inverse='_set_odometer', string='Odometer Value', help='Odometer measure of the vehicle at the moment of this log')
- odometer_unit = fields.Selection(related='vehicle_id.odometer_unit', string="Unit", readonly=True)
- date = fields.Date(help='Date when the cost has been executed')
- contract_id = fields.Many2one('fleet.vehicle.log.contract', 'Contract', help='Contract attached to this cost')
- auto_generated = fields.Boolean('Automatically Generated', readonly=True)
-
- def _get_odometer(self):
- for record in self:
- if record.odometer_id:
- record.odometer = record.odometer_id.value
-
- def _set_odometer(self):
- for record in self:
- if not record.odometer:
- raise UserError(_('Emptying the odometer value of a vehicle is not allowed.'))
- odometer = self.env['fleet.vehicle.odometer'].create({
- 'value': record.odometer,
- 'date': record.date or fields.Date.context_today(record),
- 'vehicle_id': record.vehicle_id.id
- })
- self.odometer_id = odometer
-
- @api.model
- def create(self, data):
- #make sure that the data are consistent with values of parent and contract records given
- if 'parent_id' in data and data['parent_id']:
- parent = self.browse(data['parent_id'])
- data['vehicle_id'] = parent.vehicle_id.id
- data['date'] = parent.date
- data['cost_type'] = parent.cost_type
- if 'contract_id' in data and data['contract_id']:
- contract = self.env['fleet.vehicle.log.contract'].browse(data['contract_id'])
- data['vehicle_id'] = contract.vehicle_id.id
- data['cost_subtype_id'] = contract.cost_subtype_id.id
- data['cost_type'] = contract.cost_type
- if 'odometer' in data and not data['odometer']:
- #if received value for odometer is 0, then remove it from the data as it would result to the creation of a
- #odometer log with 0, which is to be avoided
- del(data['odometer'])
- return super(FleetVehicleCost, self).create(data)
-
-class FleetVehicleTag(models.Model):
- _name = 'fleet.vehicle.tag'
-
- name = fields.Char(required=True, translate=True)
- color = fields.Integer('Color Index', default=10)
-
- _sql_constraints = [('name_uniq', 'unique (name)', "Tag name already exists !")]
-
-class FleetVehicleState(models.Model):
- _name = 'fleet.vehicle.state'
- _order = 'sequence asc'
-
- name = fields.Char(required=True)
- sequence = fields.Integer(help="Used to order the note stages")
-
- _sql_constraints = [('fleet_state_name_unique', 'unique(name)', 'State name already exists')]
-
-class FleetVehicleModel(models.Model):
- _name = 'fleet.vehicle.model'
- _description = 'Model of a vehicle'
- _order = 'name asc'
-
- name = fields.Char('Model name', required=True)
- brand_id = fields.Many2one('fleet.vehicle.model.brand', 'Make', required=True, help='Make of the vehicle')
- vendors = fields.Many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors')
- image = fields.Binary(related='brand_id.image', string="Logo")
- image_medium = fields.Binary(related='brand_id.image_medium', string="Logo (medium)")
- image_small = fields.Binary(related='brand_id.image_small', string="Logo (small)")
-
- @api.multi
- @api.depends('name', 'brand_id')
- def name_get(self):
- res = []
- for record in self:
- name = record.name
- if record.brand_id.name:
- name = record.brand_id.name + '/' + name
- res.append((record.id, name))
- return res
-
- @api.onchange('brand_id')
- def _onchange_brand(self):
- if self.brand_id:
- self.image_medium = self.brand_id.image
- else:
- self.image_medium = False
-
-class FleetVehicleModelBrand(models.Model):
- _name = 'fleet.vehicle.model.brand'
- _description = 'Brand model of the vehicle'
- _order = 'name asc'
-
- name = fields.Char('Make', required=True)
- image = fields.Binary("Logo", attachment=True,
- help="This field holds the image used as logo for the brand, limited to 1024x1024px.")
- image_medium = fields.Binary("Medium-sized image", attachment=True,
- help="Medium-sized logo of the brand. It is automatically "
- "resized as a 128x128px image, with aspect ratio preserved. "
- "Use this field in form views or some kanban views.")
- image_small = fields.Binary("Small-sized image", attachment=True,
- help="Small-sized logo of the brand. It is automatically "
- "resized as a 64x64px image, with aspect ratio preserved. "
- "Use this field anywhere a small image is required.")
-
- @api.model
- def create(self, vals):
- tools.image_resize_images(vals)
- return super(FleetVehicleModelBrand, self).create(vals)
-
- @api.multi
- def write(self, vals):
- tools.image_resize_images(vals)
- return super(FleetVehicleModelBrand, self).write(vals)
-
-class FleetVehicle(models.Model):
- _inherit = 'mail.thread'
- _name = 'fleet.vehicle'
- _description = 'Information on a vehicle'
- _order = 'license_plate asc'
-
- def _get_default_state(self):
- state = self.env.ref('fleet.vehicle_state_active', raise_if_not_found=False)
- return state and state.id or False
-
- name = fields.Char(compute="_compute_vehicle_name", store=True)
- active = fields.Boolean(default=True)
- company_id = fields.Many2one('res.company', 'Company')
- license_plate = fields.Char(required=True, help='License plate number of the vehicle (i = plate number for a car)')
- vin_sn = fields.Char('Chassis Number', help='Unique number written on the vehicle motor (VIN/SN number)', copy=False)
- driver_id = fields.Many2one('res.partner', 'Driver', help='Driver of the vehicle')
- model_id = fields.Many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle')
- log_fuel = fields.One2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs')
- log_services = fields.One2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs')
- log_contracts = fields.One2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts')
- cost_count = fields.Integer(compute="_compute_count_all", string="Costs")
- contract_count = fields.Integer(compute="_compute_count_all", string='Contracts')
- service_count = fields.Integer(compute="_compute_count_all", string='Services')
- fuel_logs_count = fields.Integer(compute="_compute_count_all", string='Fuel Logs')
- odometer_count = fields.Integer(compute="_compute_count_all", string='Odometer')
- acquisition_date = fields.Date('Acquisition Date', required=False, help='Date when the vehicle has been bought')
- color = fields.Char(help='Color of the vehicle')
- state_id = fields.Many2one('fleet.vehicle.state', 'State', default=_get_default_state, help='Current state of the vehicle', ondelete="set null")
- location = fields.Char(help='Location of the vehicle (garage, ...)')
- seats = fields.Integer('Seats Number', help='Number of seats of the vehicle')
- doors = fields.Integer('Doors Number', help='Number of doors of the vehicle', default=5)
- tag_ids = fields.Many2many('fleet.vehicle.tag', 'fleet_vehicle_vehicle_tag_rel', 'vehicle_tag_id', 'tag_id', 'Tags', copy=False)
- odometer = fields.Float(compute='_get_odometer', inverse='_set_odometer', string='Last Odometer', help='Odometer measure of the vehicle at the moment of this log')
- odometer_unit = fields.Selection([('kilometers', 'Kilometers'), ('miles', 'Miles')],
- 'Odometer Unit', default='kilometers', help='Unit of the odometer ', required=True)
- transmission = fields.Selection([('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission', help='Transmission Used by the vehicle')
- fuel_type = fields.Selection([('gasoline', 'Gasoline'), ('diesel', 'Diesel'), ('electric', 'Electric'), ('hybrid', 'Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle')
- horsepower = fields.Integer()
- horsepower_tax = fields.Float('Horsepower Taxation')
- power = fields.Integer('Power', help='Power in kW of the vehicle')
- co2 = fields.Float('CO2 Emissions', help='CO2 emissions of the vehicle')
- image = fields.Binary(related='model_id.image', string="Logo")
- image_medium = fields.Binary(related='model_id.image_medium', string="Logo (medium)")
- image_small = fields.Binary(related='model_id.image_small', string="Logo (small)")
- contract_renewal_due_soon = fields.Boolean(compute='_compute_contract_reminder', search='_search_contract_renewal_due_soon', string='Has Contracts to renew', multi='contract_info')
- contract_renewal_overdue = fields.Boolean(compute='_compute_contract_reminder', search='_search_get_overdue_contract_reminder', string='Has Contracts Overdue', multi='contract_info')
- contract_renewal_name = fields.Text(compute='_compute_contract_reminder', string='Name of contract to renew soon', multi='contract_info')
- contract_renewal_total = fields.Text(compute='_compute_contract_reminder', string='Total of contracts due or overdue minus one', multi='contract_info')
- car_value = fields.Float(help='Value of the bought vehicle')
-
- @api.depends('model_id', 'license_plate')
- def _compute_vehicle_name(self):
- for record in self:
- record.name = record.model_id.brand_id.name + '/' + record.model_id.name + '/' + record.license_plate
-
- def _get_odometer(self):
- FleetVehicalOdometer = self.env['fleet.vehicle.odometer']
- for record in self:
- vehicle_odometer = FleetVehicalOdometer.search([('vehicle_id', '=', record.id)], limit=1, order='value desc')
- if vehicle_odometer:
- record.odometer = vehicle_odometer.value
- else:
- record.odometer = 0
-
- def _set_odometer(self):
- for record in self:
- if record.odometer:
- date = fields.Date.context_today(record)
- data = {'value': record.odometer, 'date': date, 'vehicle_id': record.id}
- self.env['fleet.vehicle.odometer'].create(data)
-
- def _compute_count_all(self):
- Odometer = self.env['fleet.vehicle.odometer']
- LogFuel = self.env['fleet.vehicle.log.fuel']
- LogService = self.env['fleet.vehicle.log.services']
- LogContract = self.env['fleet.vehicle.log.contract']
- Cost = self.env['fleet.vehicle.cost']
- for record in self:
- record.odometer_count = Odometer.search_count([('vehicle_id', '=', record.id)])
- record.fuel_logs_count = LogFuel.search_count([('vehicle_id', '=', record.id)])
- record.service_count = LogService.search_count([('vehicle_id', '=', record.id)])
- record.contract_count = LogContract.search_count([('vehicle_id', '=', record.id)])
- record.cost_count = Cost.search_count([('vehicle_id', '=', record.id), ('parent_id', '=', False)])
-
- @api.depends('log_contracts')
- def _compute_contract_reminder(self):
- for record in self:
- overdue = False
- due_soon = False
- total = 0
- name = ''
- for element in record.log_contracts:
- if element.state in ('open', 'toclose') and element.expiration_date:
- current_date_str = fields.Date.context_today(record)
- due_time_str = element.expiration_date
- current_date = fields.Date.from_string(current_date_str)
- due_time = fields.Date.from_string(due_time_str)
- diff_time = (due_time - current_date).days
- if diff_time < 0:
- overdue = True
- total += 1
- if diff_time < 15 and diff_time >= 0:
- due_soon = True
- total += 1
- if overdue or due_soon:
- log_contract = self.env['fleet.vehicle.log.contract'].search([('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))],
- limit=1, order='expiration_date asc')
- if log_contract:
- #we display only the name of the oldest overdue/due soon contract
- name = log_contract.cost_subtype_id.name
-
- record.contract_renewal_overdue = overdue
- record.contract_renewal_due_soon = due_soon
- record.contract_renewal_total = total - 1 # we remove 1 from the real total for display purposes
- record.contract_renewal_name = name
-
- def _search_contract_renewal_due_soon(self, operator, value):
- res = []
- assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
- if (operator == '=' and value is True) or (operator in ('<>', '!=') and value is False):
- search_operator = 'in'
- else:
- search_operator = 'not in'
- today = fields.Date.context_today(self)
- datetime_today = fields.Datetime.from_string(today)
- limit_date = fields.Datetime.to_string(datetime_today + relativedelta(days=+15))
- self.env.cr.execute("""SELECT cost.vehicle_id,
- count(contract.id) AS contract_number
- FROM fleet_vehicle_cost cost
- LEFT JOIN fleet_vehicle_log_contract contract ON contract.cost_id = cost.id
- WHERE contract.expiration_date IS NOT NULL
- AND contract.expiration_date > %s
- AND contract.expiration_date < %s
- AND contract.state IN ('open', 'toclose')
- GROUP BY cost.vehicle_id""", (today, limit_date))
- res_ids = [x[0] for x in self.env.cr.fetchall()]
- res.append(('id', search_operator, res_ids))
- return res
-
- def _search_get_overdue_contract_reminder(self, operator, value):
- res = []
- assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
- if (operator == '=' and value is True) or (operator in ('<>', '!=') and value is False):
- search_operator = 'in'
- else:
- search_operator = 'not in'
- today = fields.Date.context_today(self)
- self.env.cr.execute('''SELECT cost.vehicle_id,
- count(contract.id) AS contract_number
- FROM fleet_vehicle_cost cost
- LEFT JOIN fleet_vehicle_log_contract contract ON contract.cost_id = cost.id
- WHERE contract.expiration_date IS NOT NULL
- AND contract.expiration_date < %s
- AND contract.state IN ('open', 'toclose')
- GROUP BY cost.vehicle_id ''', (today,))
- res_ids = [x[0] for x in self.env.cr.fetchall()]
- res.append(('id', search_operator, res_ids))
- return res
-
- @api.onchange('model_id')
- def _onchange_model(self):
- if self.model_id:
- self.image_medium = self.model_id.image
- else:
- self.image_medium = False
-
- @api.model
- def create(self, data):
- vehicle = super(FleetVehicle, self.with_context(mail_create_nolog=True)).create(data)
- vehicle.message_post(body=_('%s %s has been added to the fleet!') % (vehicle.model_id.name, vehicle.license_plate))
- return vehicle
-
- @api.multi
- def write(self, vals):
- """
- This function write an entry in the openchatter whenever we change important information
- on the vehicle like the model, the drive, the state of the vehicle or its license plate
- """
- for vehicle in self:
- changes = []
- if 'model_id' in vals and vehicle.model_id.id != vals['model_id']:
- value = self.env['fleet.vehicle.model'].browse(vals['model_id']).name
- oldmodel = vehicle.model_id.name or _('None')
- changes.append(_("Model: from '%s' to '%s'") % (oldmodel, value))
- if 'driver_id' in vals and vehicle.driver_id.id != vals['driver_id']:
- value = self.env['res.partner'].browse(vals['driver_id']).name
- olddriver = (vehicle.driver_id.name) or _('None')
- changes.append(_("Driver: from '%s' to '%s'") % (olddriver, value))
- if 'state_id' in vals and vehicle.state_id.id != vals['state_id']:
- value = self.env['fleet.vehicle.state'].browse(vals['state_id']).name
- oldstate = vehicle.state_id.name or _('None')
- changes.append(_("State: from '%s' to '%s'") % (oldstate, value))
- if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
- old_license_plate = vehicle.license_plate or _('None')
- changes.append(_("License Plate: from '%s' to '%s'") % (old_license_plate, vals['license_plate']))
-
- if len(changes) > 0:
- self.message_post(body=", ".join(changes))
-
- return super(FleetVehicle, self).write(vals)
-
- @api.multi
- def return_action_to_open(self):
- """ This opens the xml view specified in xml_id for the current vehicle """
- self.ensure_one()
- xml_id = self.env.context.get('xml_id')
- if xml_id:
- res = self.env['ir.actions.act_window'].for_xml_id('fleet', xml_id)
- res.update(
- context=dict(self.env.context, default_vehicle_id=self.id, group_by=False),
- domain=[('vehicle_id', '=', self.id)]
- )
- return res
- return False
-
- @api.multi
- def act_show_log_cost(self):
- """ This opens log view to view and add new log for this vehicle, groupby default to only show effective costs
- @return: the costs log view
- """
- self.ensure_one()
- res = self.env['ir.actions.act_window'].for_xml_id('fleet', 'fleet_vehicle_costs_action')
- res.update(
- context=dict(self.env.context, default_vehicle_id=self.id, search_default_parent_false=True),
- domain=[('vehicle_id', '=', self.id)]
- )
- return res
-
-class FleetVehicleOdometer(models.Model):
- _name = 'fleet.vehicle.odometer'
- _description = 'Odometer log for a vehicle'
- _order = 'date desc'
-
- name = fields.Char(compute='_compute_vehicle_log_name', store=True)
- date = fields.Date(default=fields.Date.context_today)
- value = fields.Float('Odometer Value', group_operator="max")
- vehicle_id = fields.Many2one('fleet.vehicle', 'Vehicle', required=True)
- unit = fields.Selection(related='vehicle_id.odometer_unit', string="Unit", readonly=True)
-
- @api.depends('vehicle_id', 'date')
- def _compute_vehicle_log_name(self):
- for record in self:
- name = record.vehicle_id.name
- if not name:
- name = record.date
- elif record.date:
- name += ' / ' + record.date
- self.name = name
-
- @api.onchange('vehicle_id')
- def _onchange_vehicle(self):
- if self.vehicle_id:
- self.unit = self.vehicle_id.odometer_unit
-
-class FleetVehicleLogFuel(models.Model):
- _name = 'fleet.vehicle.log.fuel'
- _description = 'Fuel log for vehicles'
- _inherits = {'fleet.vehicle.cost': 'cost_id'}
-
- @api.model
- def default_get(self, default_fields):
- res = super(FleetVehicleLogFuel, self).default_get(default_fields)
- service = self.env.ref('fleet.type_service_refueling', raise_if_not_found=False)
- res.update({
- 'date': fields.Date.context_today(self),
- 'cost_subtype_id': service and service.id or False,
- 'cost_type': 'fuel'
- })
- return res
-
- liter = fields.Float()
- price_per_liter = fields.Float()
- purchaser_id = fields.Many2one('res.partner', 'Purchaser', domain="['|',('customer','=',True),('employee','=',True)]")
- inv_ref = fields.Char('Invoice Reference', size=64)
- vendor_id = fields.Many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]")
- notes = fields.Text()
- cost_id = fields.Many2one('fleet.vehicle.cost', 'Cost', required=True, ondelete='cascade')
- cost_amount = fields.Float(related='cost_id.amount', string='Amount', store=True) # we need to keep this field as a related with store=True because the graph view doesn't support (1) to address fields from inherited table and (2) fields that aren't stored in database
-
- @api.onchange('vehicle_id')
- def _onchange_vehicle(self):
- if self.vehicle_id:
- self.odometer_unit = self.vehicle_id.odometer_unit
- self.purchaser_id = self.vehicle_id.driver_id.id
-
- @api.onchange('liter', 'price_per_liter', 'amount')
- def _onchange_liter_price_amount(self):
- #need to cast in float because the value receveid from web client maybe an integer (Javascript and JSON do not
- #make any difference between 3.0 and 3). This cause a problem if you encode, for example, 2 liters at 1.5 per
- #liter => total is computed as 3.0, then trigger an onchange that recomputes price_per_liter as 3/2=1 (instead
- #of 3.0/2=1.5)
- #If there is no change in the result, we return an empty dict to prevent an infinite loop due to the 3 intertwine
- #onchange. And in order to verify that there is no change in the result, we have to limit the precision of the
- #computation to 2 decimal
- liter = float(self.liter)
- price_per_liter = float(self.price_per_liter)
- amount = float(self.amount)
- if liter > 0 and price_per_liter > 0 and round(liter * price_per_liter, 2) != amount:
- self.amount = round(liter * price_per_liter, 2)
- elif amount > 0 and liter > 0 and round(amount / liter, 2) != price_per_liter:
- self.price_per_liter = round(amount / liter, 2)
- elif amount > 0 and price_per_liter > 0 and round(amount / price_per_liter, 2) != liter:
- self.liter = round(amount / price_per_liter, 2)
-
-class FleetVehicleLogServices(models.Model):
- _name = 'fleet.vehicle.log.services'
- _inherits = {'fleet.vehicle.cost': 'cost_id'}
- _description = 'Services for vehicles'
-
- @api.model
- def default_get(self, default_fields):
- res = super(FleetVehicleLogServices, self).default_get(default_fields)
- service = self.env.ref('fleet.type_service_service_8', raise_if_not_found=False)
- res.update({
- 'date': fields.Date.context_today(self),
- 'cost_subtype_id': service and service.id or False,
- 'cost_type': 'services'
- })
- return res
-
- purchaser_id = fields.Many2one('res.partner', 'Purchaser', domain="['|',('customer','=',True),('employee','=',True)]")
- inv_ref = fields.Char('Invoice Reference')
- vendor_id = fields.Many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]")
- # we need to keep this field as a related with store=True because the graph view doesn't support
- # (1) to address fields from inherited table and (2) fields that aren't stored in database
- cost_amount = fields.Float(related='cost_id.amount', string='Amount', store=True)
- notes = fields.Text()
- cost_id = fields.Many2one('fleet.vehicle.cost', 'Cost', required=True, ondelete='cascade')
-
- @api.onchange('vehicle_id')
- def _onchange_vehicle(self):
- if self.vehicle_id:
- self.odometer_unit = self.vehicle_id.odometer_unit
- self.purchaser_id = self.vehicle_id.driver_id.id
-
-class FleetServiceType(models.Model):
- _name = 'fleet.service.type'
- _description = 'Type of services available on a vehicle'
-
- name = fields.Char(required=True, translate=True)
- category = fields.Selection([('contract', 'Contract'), ('service', 'Service'), ('both', 'Both')], 'Category',
- required=True, help='Choose wheter the service refer to contracts, vehicle services or both')
-
-class FleetVehicleLogContract(models.Model):
-
- _inherits = {'fleet.vehicle.cost': 'cost_id'}
- _name = 'fleet.vehicle.log.contract'
- _description = 'Contract information on a vehicle'
- _order = 'state desc,expiration_date'
-
- def compute_next_year_date(self, strdate):
- oneyear = relativedelta(years=1)
- start_date = fields.Date.from_string(strdate)
- return fields.Date.to_string(start_date + oneyear)
-
- @api.model
- def default_get(self, default_fields):
- res = super(FleetVehicleLogContract, self).default_get(default_fields)
- contract = self.env.ref('fleet.type_contract_leasing', raise_if_not_found=False)
- res.update({
- 'date': fields.Date.context_today(self),
- 'cost_subtype_id': contract and contract.id or False,
- 'cost_type': 'contract'
- })
- return res
-
- name = fields.Text(compute='_compute_contract_name', store=True)
- active = fields.Boolean(default=True)
- start_date = fields.Date('Contract Start Date', default=fields.Date.context_today, help='Date when the coverage of the contract begins')
- expiration_date = fields.Date('Contract Expiration Date', default=lambda self: self.compute_next_year_date(fields.Date.context_today(self)),
- help='Date when the coverage of the contract expirates (by default, one year after begin date)')
- days_left = fields.Integer(compute='_compute_days_left', string='Warning Date')
- insurer_id = fields.Many2one('res.partner', 'Vendor')
- purchaser_id = fields.Many2one('res.partner', 'Contractor', default=lambda self: self.env.user.partner_id.id, help='Person to which the contract is signed for')
- ins_ref = fields.Char('Contract Reference', size=64, copy=False)
- state = fields.Selection([('open', 'In Progress'), ('toclose', 'To Close'), ('closed', 'Terminated')],
- 'Status', default='open', readonly=True, help='Choose wheter the contract is still valid or not',
- copy=False)
- notes = fields.Text('Terms and Conditions', help='Write here all supplementary information relative to this contract', copy=False)
- cost_generated = fields.Float('Recurring Cost Amount', help="Costs paid at regular intervals, depending on the cost frequency."
- "If the cost frequency is set to unique, the cost will be logged at the start date")
- cost_frequency = fields.Selection([('no', 'No'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('monthly', 'Monthly'), ('yearly', 'Yearly')], 'Recurring Cost Frequency',
- default='no', help='Frequency of the recuring cost', required=True)
- generated_cost_ids = fields.One2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs')
- sum_cost = fields.Float(compute='_compute_sum_cost', string='Indicative Costs Total')
- cost_id = fields.Many2one('fleet.vehicle.cost', 'Cost', required=True, ondelete='cascade')
- cost_amount = fields.Float(related='cost_id.amount', string='Amount', store=True) # we need to keep this field as a related with store=True because the graph view doesn't support (1) to address fields from inherited table and (2) fields that aren't stored in database
-
- @api.depends('vehicle_id', 'cost_subtype_id', 'date')
- def _compute_contract_name(self):
- for record in self:
- name = record.vehicle_id.name
- if record.cost_subtype_id.name:
- name += ' / ' + record.cost_subtype_id.name
- if record.date:
- name += ' / ' + record.date
- record.name = name
-
- @api.depends('expiration_date', 'state')
- def _compute_days_left(self):
- """return a dict with as value for each contract an integer
- if contract is in an open state and is overdue, return 0
- if contract is in a closed state, return -1
- otherwise return the number of days before the contract expires
- """
- for record in self:
- if (record.expiration_date and (record.state == 'open' or record.state == 'toclose')):
- today = fields.Date.from_string(fields.Date.today())
- renew_date = fields.Date.from_string(record.expiration_date)
- diff_time = (renew_date - today).days
- record.days_left = diff_time > 0 and diff_time or 0
- else:
- record.days_left = -1
-
- @api.depends('cost_ids.amount')
- def _compute_sum_cost(self):
- for contract in self:
- contract.sum_cost = sum(contract.cost_ids.mapped('amount'))
-
- @api.onchange('vehicle_id')
- def _onchange_vehicle(self):
- if self.vehicle_id:
- self.odometer_unit = self.vehicle_id.odometer_unit
-
- @api.multi
- def contract_close(self):
- for record in self:
- record.state = 'closed'
-
- @api.multi
- def contract_open(self):
- for record in self:
- record.state = 'open'
-
- @api.multi
- def act_renew_contract(self):
- assert len(self.ids) == 1, "This operation should only be done for 1 single contract at a time, as it it suppose to open a window as result"
- for element in self:
- #compute end date
- startdate = fields.Date.from_string(element.start_date)
- enddate = fields.Date.from_string(element.expiration_date)
- diffdate = (enddate - startdate)
- default = {
- 'date': fields.Date.context_today(self),
- 'start_date': fields.Date.to_string(fields.Date.from_string(element.expiration_date) + relativedelta(days=1)),
- 'expiration_date': fields.Date.to_string(enddate + diffdate),
- }
- newid = element.copy(default).id
- return {
- 'name': _("Renew Contract"),
- 'view_mode': 'form',
- 'view_id': self.env.ref('fleet.fleet_vehicle_log_contract_view_form').id,
- 'view_type': 'tree,form',
- 'res_model': 'fleet.vehicle.log.contract',
- 'type': 'ir.actions.act_window',
- 'domain': '[]',
- 'res_id': newid,
- 'context': {'active_id': newid},
- }
-
- @api.model
- def scheduler_manage_auto_costs(self):
- #This method is called by a cron task
- #It creates costs for contracts having the "recurring cost" field setted, depending on their frequency
- #For example, if a contract has a reccuring cost of 200 with a weekly frequency, this method creates a cost of 200 on the first day of each week, from the date of the last recurring costs in the database to today
- #If the contract has not yet any recurring costs in the database, the method generates the recurring costs from the start_date to today
- #The created costs are associated to a contract thanks to the many2one field contract_id
- #If the contract has no start_date, no cost will be created, even if the contract has recurring costs
- VehicleCost = self.env['fleet.vehicle.cost']
- deltas = {'yearly': relativedelta(years=+1), 'monthly': relativedelta(months=+1), 'weekly': relativedelta(weeks=+1), 'daily': relativedelta(days=+1)}
- contracts = self.env['fleet.vehicle.log.contract'].search([('state', '!=', 'closed')], offset=0, limit=None, order=None)
- for contract in contracts:
- if not contract.start_date or contract.cost_frequency == 'no':
- continue
- found = False
- last_cost_date = contract.start_date
- if contract.generated_cost_ids:
- last_autogenerated_cost = VehicleCost.search([('contract_id', '=', contract.id), ('auto_generated', '=', True)], offset=0, limit=1, order='date desc')
- if last_autogenerated_cost:
- found = True
- last_cost_date = last_autogenerated_cost.date
- startdate = fields.Date.from_string(last_cost_date)
- if found:
- startdate += deltas.get(contract.cost_frequency)
- today = fields.Date.from_string(fields.Date.context_today(self))
- while (startdate <= today) & (startdate <= fields.Date.from_string(contract.expiration_date)):
- data = {
- 'amount': contract.cost_generated,
- 'date': fields.Date.context_today(self),
- 'vehicle_id': contract.vehicle_id.id,
- 'cost_subtype_id': contract.cost_subtype_id.id,
- 'contract_id': contract.id,
- 'auto_generated': True
- }
- self.env['fleet.vehicle.cost'].create(data)
- startdate += deltas.get(contract.cost_frequency)
- return True
-
- @api.model
- def scheduler_manage_contract_expiration(self):
- #This method is called by a cron task
- #It manages the state of a contract, possibly by posting a message on the vehicle concerned and updating its status
- date_today = fields.Date.from_string(fields.Date.context_today(self))
- limit_date = fields.Date.to_string(date_today + relativedelta(days=+15))
- contracts = self.search([('state', '=', 'open'), ('expiration_date', '<', limit_date)])
- res = {}
- for contract in contracts:
- if contract.vehicle_id.id in res:
- res[contract.vehicle_id.id] += 1
- else:
- res[contract.vehicle_id.id] = 1
-
- Vehicle = self.env['fleet.vehicle']
- for vehicle, value in res.items():
- Vehicle.browse(vehicle).message_post(body=_('%s contract(s) need(s) to be renewed and/or closed!') % value)
- return contracts.write({'state': 'toclose'})
-
- @api.model
- def run_scheduler(self):
- self.scheduler_manage_auto_costs()
- self.scheduler_manage_contract_expiration()
diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py
new file mode 100644
index 00000000000..4a6d67bd2bf
--- /dev/null
+++ b/addons/fleet/models/fleet_vehicle.py
@@ -0,0 +1,312 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import api, fields, models, _
+
+
+class FleetVehicle(models.Model):
+ _inherit = 'mail.thread'
+ _name = 'fleet.vehicle'
+ _description = 'Information on a vehicle'
+ _order = 'license_plate asc'
+
+ def _get_default_state(self):
+ state = self.env.ref('fleet.vehicle_state_active', raise_if_not_found=False)
+ return state and state.id or False
+
+ name = fields.Char(compute="_compute_vehicle_name", store=True)
+ active = fields.Boolean(default=True)
+ company_id = fields.Many2one('res.company', 'Company')
+ license_plate = fields.Char(required=True, help='License plate number of the vehicle (i = plate number for a car)')
+ vin_sn = fields.Char('Chassis Number', help='Unique number written on the vehicle motor (VIN/SN number)', copy=False)
+ driver_id = fields.Many2one('res.partner', 'Driver', help='Driver of the vehicle')
+ model_id = fields.Many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle')
+ log_fuel = fields.One2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs')
+ log_services = fields.One2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs')
+ log_contracts = fields.One2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts')
+ cost_count = fields.Integer(compute="_compute_count_all", string="Costs")
+ contract_count = fields.Integer(compute="_compute_count_all", string='Contracts')
+ service_count = fields.Integer(compute="_compute_count_all", string='Services')
+ fuel_logs_count = fields.Integer(compute="_compute_count_all", string='Fuel Logs')
+ odometer_count = fields.Integer(compute="_compute_count_all", string='Odometer')
+ acquisition_date = fields.Date('Immatriculation Date', required=False, help='Date when the vehicle has been immatriculated')
+ color = fields.Char(help='Color of the vehicle')
+ state_id = fields.Many2one('fleet.vehicle.state', 'State', default=_get_default_state, help='Current state of the vehicle', ondelete="set null")
+ location = fields.Char(help='Location of the vehicle (garage, ...)')
+ seats = fields.Integer('Seats Number', help='Number of seats of the vehicle')
+ doors = fields.Integer('Doors Number', help='Number of doors of the vehicle', default=5)
+ tag_ids = fields.Many2many('fleet.vehicle.tag', 'fleet_vehicle_vehicle_tag_rel', 'vehicle_tag_id', 'tag_id', 'Tags', copy=False)
+ odometer = fields.Float(compute='_get_odometer', inverse='_set_odometer', string='Last Odometer',
+ help='Odometer measure of the vehicle at the moment of this log')
+ odometer_unit = fields.Selection([
+ ('kilometers', 'Kilometers'),
+ ('miles', 'Miles')
+ ], 'Odometer Unit', default='kilometers', help='Unit of the odometer ', required=True)
+ transmission = fields.Selection([('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission', help='Transmission Used by the vehicle')
+ fuel_type = fields.Selection([
+ ('gasoline', 'Gasoline'),
+ ('diesel', 'Diesel'),
+ ('electric', 'Electric'),
+ ('hybrid', 'Hybrid')
+ ], 'Fuel Type', help='Fuel Used by the vehicle')
+ horsepower = fields.Integer()
+ horsepower_tax = fields.Float('Horsepower Taxation')
+ power = fields.Integer('Power', help='Power in kW of the vehicle')
+ co2 = fields.Float('CO2 Emissions', help='CO2 emissions of the vehicle')
+ image = fields.Binary(related='model_id.image', string="Logo")
+ image_medium = fields.Binary(related='model_id.image_medium', string="Logo (medium)")
+ image_small = fields.Binary(related='model_id.image_small', string="Logo (small)")
+ contract_renewal_due_soon = fields.Boolean(compute='_compute_contract_reminder', search='_search_contract_renewal_due_soon',
+ string='Has Contracts to renew', multi='contract_info')
+ contract_renewal_overdue = fields.Boolean(compute='_compute_contract_reminder', search='_search_get_overdue_contract_reminder',
+ string='Has Contracts Overdue', multi='contract_info')
+ contract_renewal_name = fields.Text(compute='_compute_contract_reminder', string='Name of contract to renew soon', multi='contract_info')
+ contract_renewal_total = fields.Text(compute='_compute_contract_reminder', string='Total of contracts due or overdue minus one',
+ multi='contract_info')
+ car_value = fields.Float(string="Catalog Value (VAT incl.)", help='Value of the bought vehicle')
+ residual_value = fields.Float()
+
+ _sql_constraints = [
+ ('driver_id_unique', 'UNIQUE(driver_id)', 'Only one car can be assigned to the same employee!')
+ ]
+
+ @api.depends('model_id', 'license_plate')
+ def _compute_vehicle_name(self):
+ for record in self:
+ record.name = record.model_id.brand_id.name + '/' + record.model_id.name + '/' + record.license_plate
+
+ def _get_odometer(self):
+ FleetVehicalOdometer = self.env['fleet.vehicle.odometer']
+ for record in self:
+ vehicle_odometer = FleetVehicalOdometer.search([('vehicle_id', '=', record.id)], limit=1, order='value desc')
+ if vehicle_odometer:
+ record.odometer = vehicle_odometer.value
+ else:
+ record.odometer = 0
+
+ def _set_odometer(self):
+ for record in self:
+ if record.odometer:
+ date = fields.Date.context_today(record)
+ data = {'value': record.odometer, 'date': date, 'vehicle_id': record.id}
+ self.env['fleet.vehicle.odometer'].create(data)
+
+ def _compute_count_all(self):
+ Odometer = self.env['fleet.vehicle.odometer']
+ LogFuel = self.env['fleet.vehicle.log.fuel']
+ LogService = self.env['fleet.vehicle.log.services']
+ LogContract = self.env['fleet.vehicle.log.contract']
+ Cost = self.env['fleet.vehicle.cost']
+ for record in self:
+ record.odometer_count = Odometer.search_count([('vehicle_id', '=', record.id)])
+ record.fuel_logs_count = LogFuel.search_count([('vehicle_id', '=', record.id)])
+ record.service_count = LogService.search_count([('vehicle_id', '=', record.id)])
+ record.contract_count = LogContract.search_count([('vehicle_id', '=', record.id), ('state', '=', 'open')])
+ record.cost_count = Cost.search_count([('vehicle_id', '=', record.id), ('parent_id', '=', False)])
+
+ @api.depends('log_contracts')
+ def _compute_contract_reminder(self):
+ for record in self:
+ overdue = False
+ due_soon = False
+ total = 0
+ name = ''
+ for element in record.log_contracts:
+ if element.state in ('open', 'toclose') and element.expiration_date:
+ current_date_str = fields.Date.context_today(record)
+ due_time_str = element.expiration_date
+ current_date = fields.Date.from_string(current_date_str)
+ due_time = fields.Date.from_string(due_time_str)
+ diff_time = (due_time - current_date).days
+ if diff_time < 0:
+ overdue = True
+ total += 1
+ if diff_time < 15 and diff_time >= 0:
+ due_soon = True
+ total += 1
+ if overdue or due_soon:
+ log_contract = self.env['fleet.vehicle.log.contract'].search([
+ ('vehicle_id', '=', record.id),
+ ('state', 'in', ('open', 'toclose'))
+ ], limit=1, order='expiration_date asc')
+ if log_contract:
+ # we display only the name of the oldest overdue/due soon contract
+ name = log_contract.cost_subtype_id.name
+
+ record.contract_renewal_overdue = overdue
+ record.contract_renewal_due_soon = due_soon
+ record.contract_renewal_total = total - 1 # we remove 1 from the real total for display purposes
+ record.contract_renewal_name = name
+
+ def _search_contract_renewal_due_soon(self, operator, value):
+ res = []
+ assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
+ if (operator == '=' and value is True) or (operator in ('<>', '!=') and value is False):
+ search_operator = 'in'
+ else:
+ search_operator = 'not in'
+ today = fields.Date.context_today(self)
+ datetime_today = fields.Datetime.from_string(today)
+ limit_date = fields.Datetime.to_string(datetime_today + relativedelta(days=+15))
+ self.env.cr.execute("""SELECT cost.vehicle_id,
+ count(contract.id) AS contract_number
+ FROM fleet_vehicle_cost cost
+ LEFT JOIN fleet_vehicle_log_contract contract ON contract.cost_id = cost.id
+ WHERE contract.expiration_date IS NOT NULL
+ AND contract.expiration_date > %s
+ AND contract.expiration_date < %s
+ AND contract.state IN ('open', 'toclose')
+ GROUP BY cost.vehicle_id""", (today, limit_date))
+ res_ids = [x[0] for x in self.env.cr.fetchall()]
+ res.append(('id', search_operator, res_ids))
+ return res
+
+ def _search_get_overdue_contract_reminder(self, operator, value):
+ res = []
+ assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
+ if (operator == '=' and value is True) or (operator in ('<>', '!=') and value is False):
+ search_operator = 'in'
+ else:
+ search_operator = 'not in'
+ today = fields.Date.context_today(self)
+ self.env.cr.execute('''SELECT cost.vehicle_id,
+ count(contract.id) AS contract_number
+ FROM fleet_vehicle_cost cost
+ LEFT JOIN fleet_vehicle_log_contract contract ON contract.cost_id = cost.id
+ WHERE contract.expiration_date IS NOT NULL
+ AND contract.expiration_date < %s
+ AND contract.state IN ('open', 'toclose')
+ GROUP BY cost.vehicle_id ''', (today,))
+ res_ids = [x[0] for x in self.env.cr.fetchall()]
+ res.append(('id', search_operator, res_ids))
+ return res
+
+ @api.onchange('model_id')
+ def _onchange_model(self):
+ if self.model_id:
+ self.image_medium = self.model_id.image
+ else:
+ self.image_medium = False
+
+ @api.model
+ def create(self, data):
+ vehicle = super(FleetVehicle, self.with_context(mail_create_nolog=True)).create(data)
+ vehicle.message_post(body=_('%s %s has been added to the fleet!') % (vehicle.model_id.name, vehicle.license_plate))
+ return vehicle
+
+ @api.multi
+ def write(self, vals):
+ """
+ This function write an entry in the openchatter whenever we change important information
+ on the vehicle like the model, the drive, the state of the vehicle or its license plate
+ """
+ for vehicle in self:
+ changes = []
+ if 'model_id' in vals and vehicle.model_id.id != vals['model_id']:
+ value = self.env['fleet.vehicle.model'].browse(vals['model_id']).name
+ oldmodel = vehicle.model_id.name or _('None')
+ changes.append(_("Model: from '%s' to '%s'") % (oldmodel, value))
+ if 'driver_id' in vals and vehicle.driver_id.id != vals['driver_id']:
+ value = self.env['res.partner'].browse(vals['driver_id']).name
+ olddriver = (vehicle.driver_id.name) or _('None')
+ changes.append(_("Driver: from '%s' to '%s'") % (olddriver, value))
+ if 'state_id' in vals and vehicle.state_id.id != vals['state_id']:
+ value = self.env['fleet.vehicle.state'].browse(vals['state_id']).name
+ oldstate = vehicle.state_id.name or _('None')
+ changes.append(_("State: from '%s' to '%s'") % (oldstate, value))
+ if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
+ old_license_plate = vehicle.license_plate or _('None')
+ changes.append(_("License Plate: from '%s' to '%s'") % (old_license_plate, vals['license_plate']))
+
+ if len(changes) > 0:
+ self.message_post(body=", ".join(changes))
+
+ return super(FleetVehicle, self).write(vals)
+
+ @api.multi
+ def return_action_to_open(self):
+ """ This opens the xml view specified in xml_id for the current vehicle """
+ self.ensure_one()
+ xml_id = self.env.context.get('xml_id')
+ if xml_id:
+ res = self.env['ir.actions.act_window'].for_xml_id('fleet', xml_id)
+ res.update(
+ context=dict(self.env.context, default_vehicle_id=self.id, group_by=False),
+ domain=[('vehicle_id', '=', self.id)]
+ )
+ return res
+ return False
+
+ @api.multi
+ def act_show_log_cost(self):
+ """ This opens log view to view and add new log for this vehicle, groupby default to only show effective costs
+ @return: the costs log view
+ """
+ self.ensure_one()
+ res = self.env['ir.actions.act_window'].for_xml_id('fleet', 'fleet_vehicle_costs_action')
+ res.update(
+ context=dict(self.env.context, default_vehicle_id=self.id, search_default_parent_false=True),
+ domain=[('vehicle_id', '=', self.id)]
+ )
+ return res
+
+
+class FleetVehicleOdometer(models.Model):
+ _name = 'fleet.vehicle.odometer'
+ _description = 'Odometer log for a vehicle'
+ _order = 'date desc'
+
+ name = fields.Char(compute='_compute_vehicle_log_name', store=True)
+ date = fields.Date(default=fields.Date.context_today)
+ value = fields.Float('Odometer Value', group_operator="max")
+ vehicle_id = fields.Many2one('fleet.vehicle', 'Vehicle', required=True)
+ unit = fields.Selection(related='vehicle_id.odometer_unit', string="Unit", readonly=True)
+ driver_id = fields.Many2one(related="vehicle_id.driver_id", string="Driver")
+
+ @api.depends('vehicle_id', 'date')
+ def _compute_vehicle_log_name(self):
+ for record in self:
+ name = record.vehicle_id.name
+ if not name:
+ name = record.date
+ elif record.date:
+ name += ' / ' + record.date
+ self.name = name
+
+ @api.onchange('vehicle_id')
+ def _onchange_vehicle(self):
+ if self.vehicle_id:
+ self.unit = self.vehicle_id.odometer_unit
+
+
+class FleetVehicleState(models.Model):
+ _name = 'fleet.vehicle.state'
+ _order = 'sequence asc'
+
+ name = fields.Char(required=True)
+ sequence = fields.Integer(help="Used to order the note stages")
+
+ _sql_constraints = [('fleet_state_name_unique', 'unique(name)', 'State name already exists')]
+
+
+class FleetVehicleTag(models.Model):
+ _name = 'fleet.vehicle.tag'
+
+ name = fields.Char(required=True, translate=True)
+ color = fields.Integer('Color Index', default=10)
+
+ _sql_constraints = [('name_uniq', 'unique (name)', "Tag name already exists !")]
+
+
+class FleetServiceType(models.Model):
+ _name = 'fleet.service.type'
+ _description = 'Type of services available on a vehicle'
+
+ name = fields.Char(required=True, translate=True)
+ category = fields.Selection([
+ ('contract', 'Contract'),
+ ('service', 'Service'),
+ ('both', 'Both')
+ ], 'Category', required=True, help='Choose wheter the service refer to contracts, vehicle services or both')
diff --git a/addons/fleet/models/fleet_vehicle_cost.py b/addons/fleet/models/fleet_vehicle_cost.py
new file mode 100644
index 00000000000..827863e3adc
--- /dev/null
+++ b/addons/fleet/models/fleet_vehicle_cost.py
@@ -0,0 +1,358 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+from dateutil.relativedelta import relativedelta
+
+
+class FleetVehicleCost(models.Model):
+ _name = 'fleet.vehicle.cost'
+ _description = 'Cost related to a vehicle'
+ _order = 'date desc, vehicle_id asc'
+
+ name = fields.Char(related='vehicle_id.name', string='Name', store=True)
+ vehicle_id = fields.Many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log')
+ cost_subtype_id = fields.Many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost')
+ amount = fields.Float('Total Price')
+ cost_type = fields.Selection([
+ ('contract', 'Contract'),
+ ('services', 'Services'),
+ ('fuel', 'Fuel'),
+ ('other', 'Other')
+ ], 'Category of the cost', default="other", help='For internal purpose only', required=True)
+ parent_id = fields.Many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost')
+ cost_ids = fields.One2many('fleet.vehicle.cost', 'parent_id', 'Included Services', copy=True)
+ odometer_id = fields.Many2one('fleet.vehicle.odometer', 'Odometer', help='Odometer measure of the vehicle at the moment of this log')
+ odometer = fields.Float(compute="_get_odometer", inverse='_set_odometer', string='Odometer Value',
+ help='Odometer measure of the vehicle at the moment of this log')
+ odometer_unit = fields.Selection(related='vehicle_id.odometer_unit', string="Unit", readonly=True)
+ date = fields.Date(help='Date when the cost has been executed')
+ contract_id = fields.Many2one('fleet.vehicle.log.contract', 'Contract', help='Contract attached to this cost')
+ auto_generated = fields.Boolean('Automatically Generated', readonly=True)
+ description = fields.Char("Cost Description")
+
+ def _get_odometer(self):
+ for record in self:
+ if record.odometer_id:
+ record.odometer = record.odometer_id.value
+
+ def _set_odometer(self):
+ for record in self:
+ if not record.odometer:
+ raise UserError(_('Emptying the odometer value of a vehicle is not allowed.'))
+ odometer = self.env['fleet.vehicle.odometer'].create({
+ 'value': record.odometer,
+ 'date': record.date or fields.Date.context_today(record),
+ 'vehicle_id': record.vehicle_id.id
+ })
+ self.odometer_id = odometer
+
+ @api.model
+ def create(self, data):
+ # make sure that the data are consistent with values of parent and contract records given
+ if 'parent_id' in data and data['parent_id']:
+ parent = self.browse(data['parent_id'])
+ data['vehicle_id'] = parent.vehicle_id.id
+ data['date'] = parent.date
+ data['cost_type'] = parent.cost_type
+ if 'contract_id' in data and data['contract_id']:
+ contract = self.env['fleet.vehicle.log.contract'].browse(data['contract_id'])
+ data['vehicle_id'] = contract.vehicle_id.id
+ data['cost_subtype_id'] = contract.cost_subtype_id.id
+ data['cost_type'] = contract.cost_type
+ if 'odometer' in data and not data['odometer']:
+ # if received value for odometer is 0, then remove it from the data as it would result to the creation of a
+ # odometer log with 0, which is to be avoided
+ del(data['odometer'])
+ return super(FleetVehicleCost, self).create(data)
+
+
+class FleetVehicleLogContract(models.Model):
+
+ _inherits = {'fleet.vehicle.cost': 'cost_id'}
+ _name = 'fleet.vehicle.log.contract'
+ _description = 'Contract information on a vehicle'
+ _order = 'state desc,expiration_date'
+
+ def compute_next_year_date(self, strdate):
+ oneyear = relativedelta(years=1)
+ start_date = fields.Date.from_string(strdate)
+ return fields.Date.to_string(start_date + oneyear)
+
+ @api.model
+ def default_get(self, default_fields):
+ res = super(FleetVehicleLogContract, self).default_get(default_fields)
+ contract = self.env.ref('fleet.type_contract_leasing', raise_if_not_found=False)
+ res.update({
+ 'date': fields.Date.context_today(self),
+ 'cost_subtype_id': contract and contract.id or False,
+ 'cost_type': 'contract'
+ })
+ return res
+
+ name = fields.Text(compute='_compute_contract_name', store=True)
+ active = fields.Boolean(default=True)
+ start_date = fields.Date('Contract Start Date', default=fields.Date.context_today, help='Date when the coverage of the contract begins')
+ expiration_date = fields.Date('Contract Expiration Date', default=lambda self: self.compute_next_year_date(fields.Date.context_today(self)),
+ help='Date when the coverage of the contract expirates (by default, one year after begin date)')
+ days_left = fields.Integer(compute='_compute_days_left', string='Warning Date')
+ insurer_id = fields.Many2one('res.partner', 'Vendor')
+ purchaser_id = fields.Many2one('res.partner', 'Contractor', default=lambda self: self.env.user.partner_id.id,
+ help='Person to which the contract is signed for')
+ ins_ref = fields.Char('Contract Reference', size=64, copy=False)
+ state = fields.Selection([
+ ('open', 'In Progress'),
+ ('toclose', 'To Close'),
+ ('closed', 'Terminated')
+ ], 'Status', default='open', readonly=True, help='Choose wheter the contract is still valid or not',
+ copy=False)
+ notes = fields.Text('Terms and Conditions', help='Write here all supplementary information relative to this contract', copy=False)
+ cost_generated = fields.Float('Recurring Cost Amount',
+ help="Costs paid at regular intervals, depending on the cost frequency."
+ "If the cost frequency is set to unique, the cost will be logged at the start date")
+ cost_frequency = fields.Selection([
+ ('no', 'No'),
+ ('daily', 'Daily'),
+ ('weekly', 'Weekly'),
+ ('monthly', 'Monthly'),
+ ('yearly', 'Yearly')
+ ], 'Recurring Cost Frequency', default='no', help='Frequency of the recuring cost', required=True)
+ generated_cost_ids = fields.One2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs')
+ sum_cost = fields.Float(compute='_compute_sum_cost', string='Indicative Costs Total')
+ cost_id = fields.Many2one('fleet.vehicle.cost', 'Cost', required=True, ondelete='cascade')
+ # we need to keep this field as a related with store=True because the graph view doesn't support
+ # (1) to address fields from inherited table
+ # (2) fields that aren't stored in database
+ cost_amount = fields.Float(related='cost_id.amount', string='Amount', store=True)
+ odometer = fields.Float(string='Odometer at creation', help='Odometer measure of the vehicle at the moment of the contract creation')
+
+ @api.depends('vehicle_id', 'cost_subtype_id', 'date')
+ def _compute_contract_name(self):
+ for record in self:
+ name = record.vehicle_id.name
+ if record.cost_subtype_id.name:
+ name += ' / ' + record.cost_subtype_id.name
+ if record.date:
+ name += ' / ' + record.date
+ record.name = name
+
+ @api.depends('expiration_date', 'state')
+ def _compute_days_left(self):
+ """return a dict with as value for each contract an integer
+ if contract is in an open state and is overdue, return 0
+ if contract is in a closed state, return -1
+ otherwise return the number of days before the contract expires
+ """
+ for record in self:
+ if (record.expiration_date and (record.state == 'open' or record.state == 'toclose')):
+ today = fields.Date.from_string(fields.Date.today())
+ renew_date = fields.Date.from_string(record.expiration_date)
+ diff_time = (renew_date - today).days
+ record.days_left = diff_time > 0 and diff_time or 0
+ else:
+ record.days_left = -1
+
+ @api.depends('cost_ids.amount')
+ def _compute_sum_cost(self):
+ for contract in self:
+ contract.sum_cost = sum(contract.cost_ids.mapped('amount'))
+
+ @api.onchange('vehicle_id')
+ def _onchange_vehicle(self):
+ if self.vehicle_id:
+ self.odometer_unit = self.vehicle_id.odometer_unit
+
+ @api.multi
+ def contract_close(self):
+ for record in self:
+ record.state = 'closed'
+
+ @api.multi
+ def contract_open(self):
+ for record in self:
+ record.state = 'open'
+
+ @api.multi
+ def act_renew_contract(self):
+ assert len(self.ids) == 1, "This operation should only be done for 1 single contract at a time, as it it suppose to open a window as result"
+ for element in self:
+ # compute end date
+ startdate = fields.Date.from_string(element.start_date)
+ enddate = fields.Date.from_string(element.expiration_date)
+ diffdate = (enddate - startdate)
+ default = {
+ 'date': fields.Date.context_today(self),
+ 'start_date': fields.Date.to_string(fields.Date.from_string(element.expiration_date) + relativedelta(days=1)),
+ 'expiration_date': fields.Date.to_string(enddate + diffdate),
+ }
+ newid = element.copy(default).id
+ return {
+ 'name': _("Renew Contract"),
+ 'view_mode': 'form',
+ 'view_id': self.env.ref('fleet.fleet_vehicle_log_contract_view_form').id,
+ 'view_type': 'tree,form',
+ 'res_model': 'fleet.vehicle.log.contract',
+ 'type': 'ir.actions.act_window',
+ 'domain': '[]',
+ 'res_id': newid,
+ 'context': {'active_id': newid},
+ }
+
+ @api.model
+ def scheduler_manage_auto_costs(self):
+ # This method is called by a cron task
+ # It creates costs for contracts having the "recurring cost" field setted, depending on their frequency
+ # For example, if a contract has a reccuring cost of 200 with a weekly frequency, this method creates a cost of 200 on the
+ # first day of each week, from the date of the last recurring costs in the database to today
+ # If the contract has not yet any recurring costs in the database, the method generates the recurring costs from the start_date to today
+ # The created costs are associated to a contract thanks to the many2one field contract_id
+ # If the contract has no start_date, no cost will be created, even if the contract has recurring costs
+ VehicleCost = self.env['fleet.vehicle.cost']
+ deltas = {
+ 'yearly': relativedelta(years=+1),
+ 'monthly': relativedelta(months=+1),
+ 'weekly': relativedelta(weeks=+1),
+ 'daily': relativedelta(days=+1)
+ }
+ contracts = self.env['fleet.vehicle.log.contract'].search([('state', '!=', 'closed')], offset=0, limit=None, order=None)
+ for contract in contracts:
+ if not contract.start_date or contract.cost_frequency == 'no':
+ continue
+ found = False
+ last_cost_date = contract.start_date
+ if contract.generated_cost_ids:
+ last_autogenerated_cost = VehicleCost.search([
+ ('contract_id', '=', contract.id),
+ ('auto_generated', '=', True)
+ ], offset=0, limit=1, order='date desc')
+ if last_autogenerated_cost:
+ found = True
+ last_cost_date = last_autogenerated_cost.date
+ startdate = fields.Date.from_string(last_cost_date)
+ if found:
+ startdate += deltas.get(contract.cost_frequency)
+ today = fields.Date.from_string(fields.Date.context_today(self))
+ while (startdate <= today) & (startdate <= fields.Date.from_string(contract.expiration_date)):
+ data = {
+ 'amount': contract.cost_generated,
+ 'date': fields.Date.context_today(self),
+ 'vehicle_id': contract.vehicle_id.id,
+ 'cost_subtype_id': contract.cost_subtype_id.id,
+ 'contract_id': contract.id,
+ 'auto_generated': True
+ }
+ self.env['fleet.vehicle.cost'].create(data)
+ startdate += deltas.get(contract.cost_frequency)
+ return True
+
+ @api.model
+ def scheduler_manage_contract_expiration(self):
+ # This method is called by a cron task
+ # It manages the state of a contract, possibly by posting a message on the vehicle concerned and updating its status
+ date_today = fields.Date.from_string(fields.Date.context_today(self))
+ limit_date = fields.Date.to_string(date_today + relativedelta(days=+15))
+ contracts = self.search([('state', '=', 'open'), ('expiration_date', '<', limit_date)])
+ res = {}
+ for contract in contracts:
+ if contract.vehicle_id.id in res:
+ res[contract.vehicle_id.id] += 1
+ else:
+ res[contract.vehicle_id.id] = 1
+
+ Vehicle = self.env['fleet.vehicle']
+ for vehicle, value in res.items():
+ Vehicle.browse(vehicle).message_post(body=_('%s contract(s) need(s) to be renewed and/or closed!') % value)
+ return contracts.write({'state': 'toclose'})
+
+ @api.model
+ def run_scheduler(self):
+ self.scheduler_manage_auto_costs()
+ self.scheduler_manage_contract_expiration()
+
+
+class FleetVehicleLogFuel(models.Model):
+ _name = 'fleet.vehicle.log.fuel'
+ _description = 'Fuel log for vehicles'
+ _inherits = {'fleet.vehicle.cost': 'cost_id'}
+
+ @api.model
+ def default_get(self, default_fields):
+ res = super(FleetVehicleLogFuel, self).default_get(default_fields)
+ service = self.env.ref('fleet.type_service_refueling', raise_if_not_found=False)
+ res.update({
+ 'date': fields.Date.context_today(self),
+ 'cost_subtype_id': service and service.id or False,
+ 'cost_type': 'fuel'
+ })
+ return res
+
+ liter = fields.Float()
+ price_per_liter = fields.Float()
+ purchaser_id = fields.Many2one('res.partner', 'Purchaser', domain="['|',('customer','=',True),('employee','=',True)]")
+ inv_ref = fields.Char('Invoice Reference', size=64)
+ vendor_id = fields.Many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]")
+ notes = fields.Text()
+ cost_id = fields.Many2one('fleet.vehicle.cost', 'Cost', required=True, ondelete='cascade')
+ # we need to keep this field as a related with store=True because the graph view doesn't support
+ # (1) to address fields from inherited table
+ # (2) fields that aren't stored in database
+ cost_amount = fields.Float(related='cost_id.amount', string='Amount', store=True)
+
+ @api.onchange('vehicle_id')
+ def _onchange_vehicle(self):
+ if self.vehicle_id:
+ self.odometer_unit = self.vehicle_id.odometer_unit
+ self.purchaser_id = self.vehicle_id.driver_id.id
+
+ @api.onchange('liter', 'price_per_liter', 'amount')
+ def _onchange_liter_price_amount(self):
+ # need to cast in float because the value receveid from web client maybe an integer (Javascript and JSON do not
+ # make any difference between 3.0 and 3). This cause a problem if you encode, for example, 2 liters at 1.5 per
+ # liter => total is computed as 3.0, then trigger an onchange that recomputes price_per_liter as 3/2=1 (instead
+ # of 3.0/2=1.5)
+ # If there is no change in the result, we return an empty dict to prevent an infinite loop due to the 3 intertwine
+ # onchange. And in order to verify that there is no change in the result, we have to limit the precision of the
+ # computation to 2 decimal
+ liter = float(self.liter)
+ price_per_liter = float(self.price_per_liter)
+ amount = float(self.amount)
+ if liter > 0 and price_per_liter > 0 and round(liter * price_per_liter, 2) != amount:
+ self.amount = round(liter * price_per_liter, 2)
+ elif amount > 0 and liter > 0 and round(amount / liter, 2) != price_per_liter:
+ self.price_per_liter = round(amount / liter, 2)
+ elif amount > 0 and price_per_liter > 0 and round(amount / price_per_liter, 2) != liter:
+ self.liter = round(amount / price_per_liter, 2)
+
+
+class FleetVehicleLogServices(models.Model):
+ _name = 'fleet.vehicle.log.services'
+ _inherits = {'fleet.vehicle.cost': 'cost_id'}
+ _description = 'Services for vehicles'
+
+ @api.model
+ def default_get(self, default_fields):
+ res = super(FleetVehicleLogServices, self).default_get(default_fields)
+ service = self.env.ref('fleet.type_service_service_8', raise_if_not_found=False)
+ res.update({
+ 'date': fields.Date.context_today(self),
+ 'cost_subtype_id': service and service.id or False,
+ 'cost_type': 'services'
+ })
+ return res
+
+ purchaser_id = fields.Many2one('res.partner', 'Purchaser', domain="['|',('customer','=',True),('employee','=',True)]")
+ inv_ref = fields.Char('Invoice Reference')
+ vendor_id = fields.Many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]")
+ # we need to keep this field as a related with store=True because the graph view doesn't support
+ # (1) to address fields from inherited table and (2) fields that aren't stored in database
+ cost_amount = fields.Float(related='cost_id.amount', string='Amount', store=True)
+ notes = fields.Text()
+ cost_id = fields.Many2one('fleet.vehicle.cost', 'Cost', required=True, ondelete='cascade')
+
+ @api.onchange('vehicle_id')
+ def _onchange_vehicle(self):
+ if self.vehicle_id:
+ self.odometer_unit = self.vehicle_id.odometer_unit
+ self.purchaser_id = self.vehicle_id.driver_id.id
diff --git a/addons/fleet/models/fleet_vehicle_model.py b/addons/fleet/models/fleet_vehicle_model.py
new file mode 100644
index 00000000000..eb1cef20120
--- /dev/null
+++ b/addons/fleet/models/fleet_vehicle_model.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, tools
+
+
+class FleetVehicleModel(models.Model):
+ _name = 'fleet.vehicle.model'
+ _description = 'Model of a vehicle'
+ _order = 'name asc'
+
+ name = fields.Char('Model name', required=True)
+ brand_id = fields.Many2one('fleet.vehicle.model.brand', 'Make', required=True, help='Make of the vehicle')
+ vendors = fields.Many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors')
+ image = fields.Binary(related='brand_id.image', string="Logo")
+ image_medium = fields.Binary(related='brand_id.image_medium', string="Logo (medium)")
+ image_small = fields.Binary(related='brand_id.image_small', string="Logo (small)")
+
+ @api.multi
+ @api.depends('name', 'brand_id')
+ def name_get(self):
+ res = []
+ for record in self:
+ name = record.name
+ if record.brand_id.name:
+ name = record.brand_id.name + '/' + name
+ res.append((record.id, name))
+ return res
+
+ @api.onchange('brand_id')
+ def _onchange_brand(self):
+ if self.brand_id:
+ self.image_medium = self.brand_id.image
+ else:
+ self.image_medium = False
+
+
+class FleetVehicleModelBrand(models.Model):
+ _name = 'fleet.vehicle.model.brand'
+ _description = 'Brand model of the vehicle'
+ _order = 'name asc'
+
+ name = fields.Char('Make', required=True)
+ image = fields.Binary("Logo", attachment=True,
+ help="This field holds the image used as logo for the brand, limited to 1024x1024px.")
+ image_medium = fields.Binary("Medium-sized image", attachment=True,
+ help="Medium-sized logo of the brand. It is automatically "
+ "resized as a 128x128px image, with aspect ratio preserved. "
+ "Use this field in form views or some kanban views.")
+ image_small = fields.Binary("Small-sized image", attachment=True,
+ help="Small-sized logo of the brand. It is automatically "
+ "resized as a 64x64px image, with aspect ratio preserved. "
+ "Use this field anywhere a small image is required.")
+
+ @api.model
+ def create(self, vals):
+ tools.image_resize_images(vals)
+ return super(FleetVehicleModelBrand, self).create(vals)
+
+ @api.multi
+ def write(self, vals):
+ tools.image_resize_images(vals)
+ return super(FleetVehicleModelBrand, self).write(vals)
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
new file mode 100644
index 00000000000..51dceaf016f
--- /dev/null
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -0,0 +1,512 @@
+
+
+
+
+ fleet.vehicle.cost.tree
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+
+ fleet.vehicle.cost.pivot
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+
+ fleet.vehicle.cost.graph
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+ fleet.vehicle.cost.pivot
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+ fleet.vehicle.cost.graph
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+ fleet.vehicle.cost.search
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fleet.vehicle.cost.form
+ fleet.vehicle.cost
+
+
+
+
+
+
+ fleet.vehicle.cost.graph
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
+
+ Vehicle Costs
+ fleet.vehicle.cost
+ form
+ tree,form,graph
+ {"search_default_parent_false" : True, "search_default_groupby_vehicle_id" : True,}
+
+
+ Click to create a new cost.
+
+ Odoo helps you managing the costs for your different
+ vehicles. Costs are created automatically from services,
+ contracts (fixed or recurring) and fuel logs.
+
+ Manage all your contracts (leasing, insurances, etc.) with
+ their related services, costs. Odoo will automatically warn
+ you when some contracts have to be renewed.
+
+ Each contract (e.g.: leasing) may include several services
+ (reparation, insurances, periodic maintenance).
+
+ Odoo helps you keeping track of all the services done
+ on your vehicle. Services can be of many type: occasional
+ repair, fixed maintenance, etc.
+
+ You will be able to manage your fleet by keeping track of the
+ contracts, services, fixed and recurring costs, odometers and
+ fuel logs associated to each vehicle.
+
+ Odoo will warn you when services or contract have to be
+ renewed.
+
- You will be able to manage your fleet by keeping track of the
- contracts, services, fixed and recurring costs, odometers and
- fuel logs associated to each vehicle.
-
- Odoo will warn you when services or contract have to be
- renewed.
-
- Manage all your contracts (leasing, insurances, etc.) with
- their related services, costs. Odoo will automatically warn
- you when some contracts have to be renewed.
-
- Each contract (e.g.: leasing) may include several services
- (reparation, insurances, periodic maintenance).
-
- Odoo helps you keeping track of all the services done
- on your vehicle. Services can be of many type: occasional
- repair, fixed maintenance, etc.
-
- Odoo helps you managing the costs for your different
- vehicles. Costs are created automatically from services,
- contracts (fixed or recurring) and fuel logs.
-
+
-
-
-
-
-
-
-
-
+
+
diff --git a/addons/hr_payroll/__manifest__.py b/addons/hr_payroll/__manifest__.py
index e4caa40bbf6..34ff35692b6 100644
--- a/addons/hr_payroll/__manifest__.py
+++ b/addons/hr_payroll/__manifest__.py
@@ -30,12 +30,15 @@ Generic Payroll system.
'security/hr_payroll_security.xml',
'security/ir.model.access.csv',
'wizard/hr_payroll_payslips_by_employees_views.xml',
- 'views/hr_payroll_views.xml',
+ 'views/hr_contract_views.xml',
+ 'views/hr_salary_rule_views.xml',
+ 'views/hr_payslip_views.xml',
+ 'views/hr_employee_views.xml',
'data/hr_payroll_sequence.xml',
'views/hr_payroll_report.xml',
'data/hr_payroll_data.xml',
'wizard/hr_payroll_contribution_register_report_views.xml',
- 'views/res_config_views.xml',
+ 'views/hr_payroll_config_settings_views.xml',
'views/report_contributionregister_templates.xml',
'views/report_payslip_templates.xml',
'views/report_payslipdetails_templates.xml',
diff --git a/addons/hr_payroll/data/hr_payroll_data.xml b/addons/hr_payroll/data/hr_payroll_data.xml
index bcaf67ffa0e..c4b16bd05a4 100644
--- a/addons/hr_payroll/data/hr_payroll_data.xml
+++ b/addons/hr_payroll/data/hr_payroll_data.xml
@@ -37,7 +37,7 @@
- Basic
+ Basic SalaryBASIC
@@ -57,7 +57,7 @@
- Net
+ Net SalaryNET
diff --git a/addons/hr_payroll/models/__init__.py b/addons/hr_payroll/models/__init__.py
index c8c7a73abb8..792c8e2bcd2 100644
--- a/addons/hr_payroll/models/__init__.py
+++ b/addons/hr_payroll/models/__init__.py
@@ -1,5 +1,8 @@
#-*- coding:utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import hr_payroll
-import res_config
+import hr_contract
+import hr_employee
+import hr_payroll_config_settings
+import hr_salary_rule
+import hr_payslip
diff --git a/addons/hr_payroll/models/hr_contract.py b/addons/hr_payroll/models/hr_contract.py
new file mode 100644
index 00000000000..054782c406d
--- /dev/null
+++ b/addons/hr_payroll/models/hr_contract.py
@@ -0,0 +1,61 @@
+# -*- coding:utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class HrContract(models.Model):
+ """
+ Employee contract based on the visa, work permits
+ allows to configure different Salary structure
+ """
+ _inherit = 'hr.contract'
+ _description = 'Employee Contract'
+
+ struct_id = fields.Many2one('hr.payroll.structure', string='Salary Structure')
+ schedule_pay = fields.Selection([
+ ('monthly', 'Monthly'),
+ ('quarterly', 'Quarterly'),
+ ('semi-annually', 'Semi-annually'),
+ ('annually', 'Annually'),
+ ('weekly', 'Weekly'),
+ ('bi-weekly', 'Bi-weekly'),
+ ('bi-monthly', 'Bi-monthly'),
+ ], string='Scheduled Pay', index=True, default='monthly')
+ resource_calendar_id = fields.Many2one(required=True)
+
+ @api.multi
+ def get_all_structures(self):
+ """
+ @return: the structures linked to the given contracts, ordered by hierachy (parent=False first,
+ then first level children and so on) and without duplicata
+ """
+ structures = self.mapped('struct_id')
+ if not structures:
+ return []
+ # YTI TODO return browse records
+ return list(set(structures._get_parent_structure().ids))
+
+ @api.multi
+ def get_attribute(self, code, attribute):
+ return getattr(self.env['hr.contract.advantage.template'].search([('code', '=', code)], limit=1), attribute)
+
+ @api.multi
+ def set_attribute_value(self, code, active):
+ for contract in self:
+ if active:
+ value = self.env['hr.contract.advantage.template'].search([('code', '=', code)], limit=1).default_value
+ setattr(contract, code, value)
+ else:
+ setattr(contract, code, 0.0)
+
+
+class HrContractAdvandageTemplate(models.Model):
+ _name = 'hr.contract.advantage.template'
+ _description = "Employee's Advantage on Contract"
+
+ name = fields.Char('Name', required=True)
+ code = fields.Char('Code', required=True)
+ lower_bound = fields.Float('Lower Bound', help="Lower bound authorized by the employer for this advantage")
+ upper_bound = fields.Float('Upper Bound', help="Upper bound authorized by the employer for this advantage")
+ default_value = fields.Float('Default value for this advantage')
diff --git a/addons/hr_payroll/models/hr_employee.py b/addons/hr_payroll/models/hr_employee.py
new file mode 100644
index 00000000000..6d1283e7346
--- /dev/null
+++ b/addons/hr_payroll/models/hr_employee.py
@@ -0,0 +1,17 @@
+# -*- coding:utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class HrEmployee(models.Model):
+ _inherit = 'hr.employee'
+ _description = 'Employee'
+
+ slip_ids = fields.One2many('hr.payslip', 'employee_id', string='Payslips', readonly=True)
+ payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="hr_payroll.group_hr_payroll_user")
+
+ @api.multi
+ def _compute_payslip_count(self):
+ for employee in self:
+ employee.payslip_count = len(employee.slip_ids)
diff --git a/addons/hr_payroll/models/res_config.py b/addons/hr_payroll/models/hr_payroll_config_settings.py
similarity index 100%
rename from addons/hr_payroll/models/res_config.py
rename to addons/hr_payroll/models/hr_payroll_config_settings.py
diff --git a/addons/hr_payroll/models/hr_payroll.py b/addons/hr_payroll/models/hr_payslip.py
similarity index 65%
rename from addons/hr_payroll/models/hr_payroll.py
rename to addons/hr_payroll/models/hr_payslip.py
index 3220c8b0500..894dfa91a35 100644
--- a/addons/hr_payroll/models/hr_payroll.py
+++ b/addons/hr_payroll/models/hr_payslip.py
@@ -2,157 +2,15 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import time
-from datetime import datetime, timedelta
+from datetime import datetime
from datetime import time as datetime_time
from dateutil import relativedelta
import babel
from odoo import api, fields, models, tools, _
-from odoo.exceptions import UserError, ValidationError
-from odoo.tools.safe_eval import safe_eval
-
from odoo.addons import decimal_precision as dp
-
-
-class HrPayrollStructure(models.Model):
- """
- Salary structure used to defined
- - Basic
- - Allowances
- - Deductions
- """
- _name = 'hr.payroll.structure'
- _description = 'Salary Structure'
-
- @api.model
- def _get_parent(self):
- return self.env.ref('hr_payroll.structure_base', False)
-
- name = fields.Char(required=True)
- code = fields.Char(string='Reference', required=True)
- company_id = fields.Many2one('res.company', string='Company', required=True,
- copy=False, default=lambda self: self.env['res.company']._company_default_get())
- note = fields.Text(string='Description')
- parent_id = fields.Many2one('hr.payroll.structure', string='Parent', default=_get_parent)
- children_ids = fields.One2many('hr.payroll.structure', 'parent_id', string='Children', copy=True)
- rule_ids = fields.Many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', string='Salary Rules')
-
- @api.constrains('parent_id')
- def _check_parent_id(self):
- if not self._check_recursion():
- raise ValidationError(_('Error ! You cannot create a recursive Salary Structure.'))
-
- @api.multi
- def copy(self, default=None):
- self.ensure_one()
- default = dict(default or {}, code=_("%s (copy)") % (self.code))
- return super(HrPayrollStructure, self).copy(default)
-
- @api.multi
- def get_all_rules(self):
- """
- @return: returns a list of tuple (id, sequence) of rules that are maybe to apply
- """
- all_rules = []
- for struct in self:
- all_rules += struct.rule_ids._recursive_search_of_rules()
- return all_rules
-
- @api.multi
- def _get_parent_structure(self):
- parent = self.mapped('parent_id')
- if parent:
- parent = parent._get_parent_structure()
- return parent + self
-
-
-class HrContract(models.Model):
- """
- Employee contract based on the visa, work permits
- allows to configure different Salary structure
- """
- _inherit = 'hr.contract'
- _description = 'Employee Contract'
-
- struct_id = fields.Many2one('hr.payroll.structure', string='Salary Structure')
- schedule_pay = fields.Selection([
- ('monthly', 'Monthly'),
- ('quarterly', 'Quarterly'),
- ('semi-annually', 'Semi-annually'),
- ('annually', 'Annually'),
- ('weekly', 'Weekly'),
- ('bi-weekly', 'Bi-weekly'),
- ('bi-monthly', 'Bi-monthly'),
- ], string='Scheduled Pay', index=True, default='monthly')
-
- @api.multi
- def get_all_structures(self):
- """
- @return: the structures linked to the given contracts, ordered by hierachy (parent=False first,
- then first level children and so on) and without duplicata
- """
- structures = self.mapped('struct_id')
- if not structures:
- return []
- # YTI TODO return browse records
- return list(set(structures._get_parent_structure().ids))
-
-
-class HrContributionRegister(models.Model):
- _name = 'hr.contribution.register'
- _description = 'Contribution Register'
-
- company_id = fields.Many2one('res.company', string='Company',
- default=lambda self: self.env['res.company']._company_default_get())
- partner_id = fields.Many2one('res.partner', string='Partner')
- name = fields.Char(required=True)
- register_line_ids = fields.One2many('hr.payslip.line', 'register_id',
- string='Register Line', readonly=True)
- note = fields.Text(string='Description')
-
-
-class HrSalaryRuleCategory(models.Model):
- _name = 'hr.salary.rule.category'
- _description = 'Salary Rule Category'
-
- name = fields.Char(required=True)
- code = fields.Char(required=True)
- parent_id = fields.Many2one('hr.salary.rule.category', string='Parent',
- help="Linking a salary category to its parent is used only for the reporting purpose.")
- children_ids = fields.One2many('hr.salary.rule.category', 'parent_id', string='Children')
- note = fields.Text(string='Description')
- company_id = fields.Many2one('res.company', string='Company',
- default=lambda self: self.env['res.company']._company_default_get())
-
-
-class HrPayslipRun(models.Model):
- _name = 'hr.payslip.run'
- _description = 'Payslip Batches'
-
- name = fields.Char(required=True, readonly=True, states={'draft': [('readonly', False)]})
- slip_ids = fields.One2many('hr.payslip', 'payslip_run_id', string='Payslips', readonly=True,
- states={'draft': [('readonly', False)]})
- state = fields.Selection([
- ('draft', 'Draft'),
- ('close', 'Close'),
- ], string='Status', index=True, readonly=True, copy=False, default='draft')
- date_start = fields.Date(string='Date From', required=True, readonly=True,
- states={'draft': [('readonly', False)]}, default=time.strftime('%Y-%m-01'))
- date_end = fields.Date(string='Date To', required=True, readonly=True,
- states={'draft': [('readonly', False)]},
- default=str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10])
- credit_note = fields.Boolean(string='Credit Note', readonly=True,
- states={'draft': [('readonly', False)]},
- help="If its checked, indicates that all payslips generated from here are refund payslips.")
-
- @api.multi
- def draft_payslip_run(self):
- return self.write({'state': 'draft'})
-
- @api.multi
- def close_payslip_run(self):
- return self.write({'state': 'close'})
+from odoo.exceptions import UserError, ValidationError
class HrPayslip(models.Model):
@@ -271,7 +129,7 @@ class HrPayslip(models.Model):
raise UserError(_('You cannot delete a payslip which is not draft or cancelled!'))
return super(HrPayslip, self).unlink()
- #TODO move this function into hr_contract module, on hr.employee object
+ # TODO move this function into hr_contract module, on hr.employee object
@api.model
def get_contract(self, employee, date_from, date_to):
"""
@@ -280,20 +138,20 @@ class HrPayslip(models.Model):
@param date_to: date field
@return: returns the ids of all the contracts for the given employee that need to be considered for the given dates
"""
- #a contract is valid if it ends between the given dates
+ # a contract is valid if it ends between the given dates
clause_1 = ['&', ('date_end', '<=', date_to), ('date_end', '>=', date_from)]
- #OR if it starts between the given dates
+ # OR if it starts between the given dates
clause_2 = ['&', ('date_start', '<=', date_to), ('date_start', '>=', date_from)]
- #OR if it starts before the date_from and finish after the date_end (or never finish)
+ # OR if it starts before the date_from and finish after the date_end (or never finish)
clause_3 = ['&', ('date_start', '<=', date_from), '|', ('date_end', '=', False), ('date_end', '>=', date_to)]
- clause_final = [('employee_id', '=', employee.id), '|', '|'] + clause_1 + clause_2 + clause_3
+ clause_final = [('employee_id', '=', employee.id), ('state', '=', 'open'), '|', '|'] + clause_1 + clause_2 + clause_3
return self.env['hr.contract'].search(clause_final).ids
@api.multi
def compute_sheet(self):
for payslip in self:
number = payslip.number or self.env['ir.sequence'].next_by_code('salary.slip')
- #delete old payslip lines
+ # delete old payslip lines
payslip.line_ids.unlink()
# set the list of contract for which the rules have to be applied
# if we don't give the contract, then the rules to apply should be for all current contracts of the employee
@@ -304,14 +162,14 @@ class HrPayslip(models.Model):
return True
@api.model
- def get_worked_day_lines(self, contract_ids, date_from, date_to):
+ def get_worked_day_lines(self, contracts, date_from, date_to):
"""
- @param contract_ids: list of contract id
+ @param contract: Browse record of contracts
@return: returns a list of dict containing the input that should be applied for the given contract between date_from and date_to
"""
res = []
# fill only if the contract as a working schedule linked
- for contract in self.env['hr.contract'].browse(contract_ids).filtered(lambda contract: contract.resource_calendar_id):
+ for contract in contracts.filtered(lambda contract: contract.resource_calendar_id):
day_from = datetime.combine(fields.Date.from_string(date_from), datetime_time.min)
day_to = datetime.combine(fields.Date.from_string(date_to), datetime_time.max)
@@ -329,7 +187,7 @@ class HrPayslip(models.Model):
'number_of_hours': 0.0,
'contract_id': contract.id,
})
- leave_time = (interval[1] - interval[0]).seconds/3600
+ leave_time = (interval[1] - interval[0]).seconds / 3600
current_leave_struct['number_of_hours'] += leave_time
work_hours = contract.employee_id.get_day_work_hours_count(interval[0].date(), calendar=contract.resource_calendar_id)
current_leave_struct['number_of_days'] += leave_time / work_hours
@@ -348,12 +206,10 @@ class HrPayslip(models.Model):
res += [attendances] + leaves.values()
return res
- # YTI TODO contract_ids should be a browse record
@api.model
- def get_inputs(self, contract_ids, date_from, date_to):
+ def get_inputs(self, contracts, date_from, date_to):
res = []
- contracts = self.env['hr.contract'].browse(contract_ids)
structure_ids = contracts.get_all_structures()
rule_ids = self.env['hr.payroll.structure'].browse(structure_ids).get_all_rules()
sorted_rule_ids = [id for id, sequence in sorted(rule_ids, key=lambda x:x[1])]
@@ -374,9 +230,7 @@ class HrPayslip(models.Model):
def _sum_salary_rule_category(localdict, category, amount):
if category.parent_id:
localdict = _sum_salary_rule_category(localdict, category.parent_id, amount)
- if category.code in localdict['categories'].dict:
- amount += localdict['categories'].dict[category.code]
- localdict['categories'].dict[category.code] = amount
+ localdict['categories'].dict[category.code] = category.code in localdict['categories'].dict and localdict['categories'].dict[category.code] + amount or amount
return localdict
class BrowsableObject(object):
@@ -567,8 +421,9 @@ class HrPayslip(models.Model):
'struct_id': struct.id,
})
#computation of the salary input
- worked_days_line_ids = self.get_worked_day_lines(contract_ids, date_from, date_to)
- input_line_ids = self.get_inputs(contract_ids, date_from, date_to)
+ contracts = self.env['hr.contract'].browse(contract_ids)
+ worked_days_line_ids = self.get_worked_day_lines(contracts, date_from, date_to)
+ input_line_ids = self.get_inputs(contracts, date_from, date_to)
res['value'].update({
'worked_days_line_ids': worked_days_line_ids,
'input_line_ids': input_line_ids,
@@ -601,13 +456,14 @@ class HrPayslip(models.Model):
self.struct_id = self.contract_id.struct_id
#computation of the salary input
- worked_days_line_ids = self.get_worked_day_lines(contract_ids, date_from, date_to)
+ contracts = self.env['hr.contract'].browse(contract_ids)
+ worked_days_line_ids = self.get_worked_day_lines(contracts, date_from, date_to)
worked_days_lines = self.worked_days_line_ids.browse([])
for r in worked_days_line_ids:
worked_days_lines += worked_days_lines.new(r)
self.worked_days_line_ids = worked_days_lines
- input_line_ids = self.get_inputs(contract_ids, date_from, date_to)
+ input_line_ids = self.get_inputs(contracts, date_from, date_to)
input_lines = self.input_line_ids.browse([])
for r in input_line_ids:
input_lines += input_lines.new(r)
@@ -621,6 +477,45 @@ class HrPayslip(models.Model):
self.with_context(contract=True).onchange_employee()
return
+ def get_salary_line_total(self, code):
+ self.ensure_one()
+ line = self.line_ids.filtered(lambda line: line.code == code)
+ if line:
+ return line[0].total
+ else:
+ return 0.0
+
+
+class HrPayslipLine(models.Model):
+ _name = 'hr.payslip.line'
+ _inherit = 'hr.salary.rule'
+ _description = 'Payslip Line'
+ _order = 'contract_id, sequence'
+
+ slip_id = fields.Many2one('hr.payslip', string='Pay Slip', required=True, ondelete='cascade')
+ salary_rule_id = fields.Many2one('hr.salary.rule', string='Rule', required=True)
+ employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
+ contract_id = fields.Many2one('hr.contract', string='Contract', required=True, index=True)
+ rate = fields.Float(string='Rate (%)', digits=dp.get_precision('Payroll Rate'), default=100.0)
+ amount = fields.Float(digits=dp.get_precision('Payroll'))
+ quantity = fields.Float(digits=dp.get_precision('Payroll'), default=1.0)
+ total = fields.Float(compute='_compute_total', string='Total', digits=dp.get_precision('Payroll'), store=True)
+
+ @api.depends('quantity', 'amount', 'rate')
+ def _compute_total(self):
+ for line in self:
+ line.total = float(line.quantity) * line.amount * line.rate / 100
+
+ @api.model
+ def create(self, values):
+ if 'employee_id' not in values or 'contract_id' not in values:
+ payslip = self.env['hr.payslip'].browse(values.get('slip_id'))
+ values['employee_id'] = values.get('employee_id') or payslip.employee_id.id
+ values['contract_id'] = values.get('contract_id') or payslip.contract_id and payslip.contract_id.id
+ if not values['contract_id']:
+ raise UserError(_('You must set a contract to create a payslip line.'))
+ return super(HrPayslipLine, self).create(values)
+
class HrPayslipWorkedDays(models.Model):
_name = 'hr.payslip.worked_days'
@@ -653,194 +548,30 @@ class HrPayslipInput(models.Model):
help="The contract for which applied this input")
-class HrSalaryRule(models.Model):
- _name = 'hr.salary.rule'
+class HrPayslipRun(models.Model):
+ _name = 'hr.payslip.run'
+ _description = 'Payslip Batches'
- name = fields.Char(required=True)
- code = fields.Char(required=True,
- help="The code of salary rules can be used as reference in computation of other rules. "
- "In that case, it is case sensitive.")
- sequence = fields.Integer(required=True, index=True, default=5,
- help='Use to arrange calculation sequence')
- quantity = fields.Char(default='1.0',
- help="It is used in computation for percentage and fixed amount. "
- "For e.g. A rule for Meal Voucher having fixed amount of "
- u"1€ per worked day can have its quantity defined in expression "
- "like worked_days.WORK100.number_of_days.")
- category_id = fields.Many2one('hr.salary.rule.category', string='Category', required=True)
- active = fields.Boolean(default=True,
- help="If the active field is set to false, it will allow you to hide the salary rule without removing it.")
- appears_on_payslip = fields.Boolean(string='Appears on Payslip', default=True,
- help="Used to display the salary rule on payslip.")
- parent_rule_id = fields.Many2one('hr.salary.rule', string='Parent Salary Rule', index=True)
- company_id = fields.Many2one('res.company', string='Company',
- default=lambda self: self.env['res.company']._company_default_get())
- condition_select = fields.Selection([
- ('none', 'Always True'),
- ('range', 'Range'),
- ('python', 'Python Expression')
- ], string="Condition Based on", default='none', required=True)
- condition_range = fields.Char(string='Range Based on', default='contract.wage',
- help='This will be used to compute the % fields values; in general it is on basic, '
- 'but you can also use categories code fields in lowercase as a variable names '
- '(hra, ma, lta, etc.) and the variable basic.')
- condition_python = fields.Text(string='Python Condition', required=True,
- default='''
- # Available variables:
- #----------------------
- # payslip: object containing the payslips
- # employee: hr.employee object
- # contract: hr.contract object
- # rules: object containing the rules code (previously computed)
- # categories: object containing the computed salary rule categories (sum of amount of all rules belonging to that category).
- # worked_days: object containing the computed worked days
- # inputs: object containing the computed inputs
-
- # Note: returned value have to be set in the variable 'result'
-
- result = rules.NET > categories.NET * 0.10''',
- help='Applied this rule for calculation if condition is true. You can specify condition like basic > 1000.')
- condition_range_min = fields.Float(string='Minimum Range', help="The minimum amount, applied for this rule.")
- condition_range_max = fields.Float(string='Maximum Range', help="The maximum amount, applied for this rule.")
- amount_select = fields.Selection([
- ('percentage', 'Percentage (%)'),
- ('fix', 'Fixed Amount'),
- ('code', 'Python Code'),
- ], string='Amount Type', index=True, required=True, default='fix', help="The computation method for the rule amount.")
- amount_fix = fields.Float(string='Fixed Amount', digits=dp.get_precision('Payroll'))
- amount_percentage = fields.Float(string='Percentage (%)', digits=dp.get_precision('Payroll Rate'),
- help='For example, enter 50.0 to apply a percentage of 50%')
- amount_python_compute = fields.Text(string='Python Code',
- default='''
- # Available variables:
- #----------------------
- # payslip: object containing the payslips
- # employee: hr.employee object
- # contract: hr.contract object
- # rules: object containing the rules code (previously computed)
- # categories: object containing the computed salary rule categories (sum of amount of all rules belonging to that category).
- # worked_days: object containing the computed worked days.
- # inputs: object containing the computed inputs.
-
- # Note: returned value have to be set in the variable 'result'
-
- result = contract.wage * 0.10''')
- amount_percentage_base = fields.Char(string='Percentage based on', help='result will be affected to a variable')
- child_ids = fields.One2many('hr.salary.rule', 'parent_rule_id', string='Child Salary Rule', copy=True)
- register_id = fields.Many2one('hr.contribution.register', string='Contribution Register',
- help="Eventual third party involved in the salary payment of the employees.")
- input_ids = fields.One2many('hr.rule.input', 'input_id', string='Inputs', copy=True)
- note = fields.Text(string='Description')
+ name = fields.Char(required=True, readonly=True, states={'draft': [('readonly', False)]})
+ slip_ids = fields.One2many('hr.payslip', 'payslip_run_id', string='Payslips', readonly=True,
+ states={'draft': [('readonly', False)]})
+ state = fields.Selection([
+ ('draft', 'Draft'),
+ ('close', 'Close'),
+ ], string='Status', index=True, readonly=True, copy=False, default='draft')
+ date_start = fields.Date(string='Date From', required=True, readonly=True,
+ states={'draft': [('readonly', False)]}, default=time.strftime('%Y-%m-01'))
+ date_end = fields.Date(string='Date To', required=True, readonly=True,
+ states={'draft': [('readonly', False)]},
+ default=str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10])
+ credit_note = fields.Boolean(string='Credit Note', readonly=True,
+ states={'draft': [('readonly', False)]},
+ help="If its checked, indicates that all payslips generated from here are refund payslips.")
@api.multi
- def _recursive_search_of_rules(self):
- """
- @return: returns a list of tuple (id, sequence) which are all the children of the passed rule_ids
- """
- children_rules = []
- for rule in self.filtered(lambda rule: rule.child_ids):
- children_rules += rule.child_ids._recursive_search_of_rules()
- return [(rule.id, rule.sequence) for rule in self] + children_rules
-
- #TODO should add some checks on the type of result (should be float)
- @api.multi
- def compute_rule(self, localdict):
- """
- :param localdict: dictionary containing the environement in which to compute the rule
- :return: returns a tuple build as the base/amount computed, the quantity and the rate
- :rtype: (float, float, float)
- """
- self.ensure_one()
- if self.amount_select == 'fix':
- try:
- return self.amount_fix, float(safe_eval(self.quantity, localdict)), 100.0
- except:
- raise UserError(_('Wrong quantity defined for salary rule %s (%s).') % (self.name, self.code))
- elif self.amount_select == 'percentage':
- try:
- return (float(safe_eval(self.amount_percentage_base, localdict)),
- float(safe_eval(self.quantity, localdict)),
- self.amount_percentage)
- except:
- raise UserError(_('Wrong percentage base or quantity defined for salary rule %s (%s).') % (self.name, self.code))
- else:
- try:
- safe_eval(self.amount_python_compute, localdict, mode='exec', nocopy=True)
- return float(localdict['result']), 'result_qty' in localdict and localdict['result_qty'] or 1.0, 'result_rate' in localdict and localdict['result_rate'] or 100.0
- except:
- raise UserError(_('Wrong python code defined for salary rule %s (%s).') % (self.name, self.code))
+ def draft_payslip_run(self):
+ return self.write({'state': 'draft'})
@api.multi
- def satisfy_condition(self, localdict):
- """
- @param contract_id: id of hr.contract to be tested
- @return: returns True if the given rule match the condition for the given contract. Return False otherwise.
- """
- self.ensure_one()
-
- if self.condition_select == 'none':
- return True
- elif self.condition_select == 'range':
- try:
- result = safe_eval(self.condition_range, localdict)
- return self.condition_range_min <= result and result <= self.condition_range_max or False
- except:
- raise UserError(_('Wrong range condition defined for salary rule %s (%s).') % (self.name, self.code))
- else: # python code
- try:
- safe_eval(self.condition_python, localdict, mode='exec', nocopy=True)
- return 'result' in localdict and localdict['result'] or False
- except:
- raise UserError(_('Wrong python condition defined for salary rule %s (%s).') % (self.name, self.code))
-
-
-class HrRuleInput(models.Model):
- _name = 'hr.rule.input'
- _description = 'Salary Rule Input'
-
- name = fields.Char(string='Description', required=True)
- code = fields.Char(required=True, help="The code that can be used in the salary rules")
- input_id = fields.Many2one('hr.salary.rule', string='Salary Rule Input', required=True)
-
-
-class HrPayslipLine(models.Model):
- _name = 'hr.payslip.line'
- _inherit = 'hr.salary.rule'
- _description = 'Payslip Line'
- _order = 'contract_id, sequence'
-
- slip_id = fields.Many2one('hr.payslip', string='Pay Slip', required=True, ondelete='cascade')
- salary_rule_id = fields.Many2one('hr.salary.rule', string='Rule', required=True)
- employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
- contract_id = fields.Many2one('hr.contract', string='Contract', required=True, index=True)
- rate = fields.Float(string='Rate (%)', digits=dp.get_precision('Payroll Rate'), default=100.0)
- amount = fields.Float(digits=dp.get_precision('Payroll'))
- quantity = fields.Float(digits=dp.get_precision('Payroll'), default=1.0)
- total = fields.Float(compute='_compute_total', string='Total', digits=dp.get_precision('Payroll'), store=True)
-
- @api.depends('quantity', 'amount', 'rate')
- def _compute_total(self):
- for line in self:
- line.total = float(line.quantity) * line.amount * line.rate / 100
-
- @api.model
- def create(self, values):
- if 'employee_id' not in values or 'contract_id' not in values:
- payslip = self.env['hr.payslip'].browse(values.get('slip_id'))
- values['employee_id'] = values.get('employee_id') or payslip.employee_id.id
- values['contract_id'] = values.get('contract_id') or payslip.contract_id and payslip.contract_id.id
- if not values['contract_id']:
- raise UserError(_('You must set a contract to create a payslip line.'))
- return super(HrPayslipLine, self).create(values)
-
-class HrEmployee(models.Model):
- _inherit = 'hr.employee'
- _description = 'Employee'
-
- slip_ids = fields.One2many('hr.payslip', 'employee_id', string='Payslips', readonly=True)
- payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="hr_payroll.group_hr_payroll_user")
-
- @api.multi
- def _compute_payslip_count(self):
- for employee in self:
- employee.payslip_count = len(employee.slip_ids)
+ def close_payslip_run(self):
+ return self.write({'state': 'close'})
diff --git a/addons/hr_payroll/models/hr_salary_rule.py b/addons/hr_payroll/models/hr_salary_rule.py
new file mode 100644
index 00000000000..cf1b01fa60c
--- /dev/null
+++ b/addons/hr_payroll/models/hr_salary_rule.py
@@ -0,0 +1,236 @@
+# -*- coding:utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+from odoo.tools.safe_eval import safe_eval
+
+from odoo.addons import decimal_precision as dp
+
+class HrPayrollStructure(models.Model):
+ """
+ Salary structure used to defined
+ - Basic
+ - Allowances
+ - Deductions
+ """
+ _name = 'hr.payroll.structure'
+ _description = 'Salary Structure'
+
+ @api.model
+ def _get_parent(self):
+ return self.env.ref('hr_payroll.structure_base', False)
+
+ name = fields.Char(required=True)
+ code = fields.Char(string='Reference', required=True)
+ company_id = fields.Many2one('res.company', string='Company', required=True,
+ copy=False, default=lambda self: self.env['res.company']._company_default_get())
+ note = fields.Text(string='Description')
+ parent_id = fields.Many2one('hr.payroll.structure', string='Parent', default=_get_parent)
+ children_ids = fields.One2many('hr.payroll.structure', 'parent_id', string='Children', copy=True)
+ rule_ids = fields.Many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', string='Salary Rules')
+
+ @api.constrains('parent_id')
+ def _check_parent_id(self):
+ if not self._check_recursion():
+ raise ValidationError(_('Error ! You cannot create a recursive Salary Structure.'))
+
+ @api.multi
+ def copy(self, default=None):
+ self.ensure_one()
+ default = dict(default or {}, code=_("%s (copy)") % (self.code))
+ return super(HrPayrollStructure, self).copy(default)
+
+ @api.multi
+ def get_all_rules(self):
+ """
+ @return: returns a list of tuple (id, sequence) of rules that are maybe to apply
+ """
+ all_rules = []
+ for struct in self:
+ all_rules += struct.rule_ids._recursive_search_of_rules()
+ return all_rules
+
+ @api.multi
+ def _get_parent_structure(self):
+ parent = self.mapped('parent_id')
+ if parent:
+ parent = parent._get_parent_structure()
+ return parent + self
+
+
+class HrContributionRegister(models.Model):
+ _name = 'hr.contribution.register'
+ _description = 'Contribution Register'
+
+ company_id = fields.Many2one('res.company', string='Company',
+ default=lambda self: self.env['res.company']._company_default_get())
+ partner_id = fields.Many2one('res.partner', string='Partner')
+ name = fields.Char(required=True)
+ register_line_ids = fields.One2many('hr.payslip.line', 'register_id',
+ string='Register Line', readonly=True)
+ note = fields.Text(string='Description')
+
+
+class HrSalaryRuleCategory(models.Model):
+ _name = 'hr.salary.rule.category'
+ _description = 'Salary Rule Category'
+
+ name = fields.Char(required=True)
+ code = fields.Char(required=True)
+ parent_id = fields.Many2one('hr.salary.rule.category', string='Parent',
+ help="Linking a salary category to its parent is used only for the reporting purpose.")
+ children_ids = fields.One2many('hr.salary.rule.category', 'parent_id', string='Children')
+ note = fields.Text(string='Description')
+ company_id = fields.Many2one('res.company', string='Company',
+ default=lambda self: self.env['res.company']._company_default_get())
+
+
+class HrSalaryRule(models.Model):
+ _name = 'hr.salary.rule'
+
+ name = fields.Char(required=True)
+ code = fields.Char(required=True,
+ help="The code of salary rules can be used as reference in computation of other rules. "
+ "In that case, it is case sensitive.")
+ sequence = fields.Integer(required=True, index=True, default=5,
+ help='Use to arrange calculation sequence')
+ quantity = fields.Char(default='1.0',
+ help="It is used in computation for percentage and fixed amount. "
+ "For e.g. A rule for Meal Voucher having fixed amount of "
+ u"1€ per worked day can have its quantity defined in expression "
+ "like worked_days.WORK100.number_of_days.")
+ category_id = fields.Many2one('hr.salary.rule.category', string='Category', required=True)
+ active = fields.Boolean(default=True,
+ help="If the active field is set to false, it will allow you to hide the salary rule without removing it.")
+ appears_on_payslip = fields.Boolean(string='Appears on Payslip', default=True,
+ help="Used to display the salary rule on payslip.")
+ parent_rule_id = fields.Many2one('hr.salary.rule', string='Parent Salary Rule', index=True)
+ company_id = fields.Many2one('res.company', string='Company',
+ default=lambda self: self.env['res.company']._company_default_get())
+ condition_select = fields.Selection([
+ ('none', 'Always True'),
+ ('range', 'Range'),
+ ('python', 'Python Expression')
+ ], string="Condition Based on", default='none', required=True)
+ condition_range = fields.Char(string='Range Based on', default='contract.wage',
+ help='This will be used to compute the % fields values; in general it is on basic, '
+ 'but you can also use categories code fields in lowercase as a variable names '
+ '(hra, ma, lta, etc.) and the variable basic.')
+ condition_python = fields.Text(string='Python Condition', required=True,
+ default='''
+ # Available variables:
+ #----------------------
+ # payslip: object containing the payslips
+ # employee: hr.employee object
+ # contract: hr.contract object
+ # rules: object containing the rules code (previously computed)
+ # categories: object containing the computed salary rule categories (sum of amount of all rules belonging to that category).
+ # worked_days: object containing the computed worked days
+ # inputs: object containing the computed inputs
+
+ # Note: returned value have to be set in the variable 'result'
+
+ result = rules.NET > categories.NET * 0.10''',
+ help='Applied this rule for calculation if condition is true. You can specify condition like basic > 1000.')
+ condition_range_min = fields.Float(string='Minimum Range', help="The minimum amount, applied for this rule.")
+ condition_range_max = fields.Float(string='Maximum Range', help="The maximum amount, applied for this rule.")
+ amount_select = fields.Selection([
+ ('percentage', 'Percentage (%)'),
+ ('fix', 'Fixed Amount'),
+ ('code', 'Python Code'),
+ ], string='Amount Type', index=True, required=True, default='fix', help="The computation method for the rule amount.")
+ amount_fix = fields.Float(string='Fixed Amount', digits=dp.get_precision('Payroll'))
+ amount_percentage = fields.Float(string='Percentage (%)', digits=dp.get_precision('Payroll Rate'),
+ help='For example, enter 50.0 to apply a percentage of 50%')
+ amount_python_compute = fields.Text(string='Python Code',
+ default='''
+ # Available variables:
+ #----------------------
+ # payslip: object containing the payslips
+ # employee: hr.employee object
+ # contract: hr.contract object
+ # rules: object containing the rules code (previously computed)
+ # categories: object containing the computed salary rule categories (sum of amount of all rules belonging to that category).
+ # worked_days: object containing the computed worked days.
+ # inputs: object containing the computed inputs.
+
+ # Note: returned value have to be set in the variable 'result'
+
+ result = contract.wage * 0.10''')
+ amount_percentage_base = fields.Char(string='Percentage based on', help='result will be affected to a variable')
+ child_ids = fields.One2many('hr.salary.rule', 'parent_rule_id', string='Child Salary Rule', copy=True)
+ register_id = fields.Many2one('hr.contribution.register', string='Contribution Register',
+ help="Eventual third party involved in the salary payment of the employees.")
+ input_ids = fields.One2many('hr.rule.input', 'input_id', string='Inputs', copy=True)
+ note = fields.Text(string='Description')
+
+ @api.multi
+ def _recursive_search_of_rules(self):
+ """
+ @return: returns a list of tuple (id, sequence) which are all the children of the passed rule_ids
+ """
+ children_rules = []
+ for rule in self.filtered(lambda rule: rule.child_ids):
+ children_rules += rule.child_ids._recursive_search_of_rules()
+ return [(rule.id, rule.sequence) for rule in self] + children_rules
+
+ #TODO should add some checks on the type of result (should be float)
+ @api.multi
+ def compute_rule(self, localdict):
+ """
+ :param localdict: dictionary containing the environement in which to compute the rule
+ :return: returns a tuple build as the base/amount computed, the quantity and the rate
+ :rtype: (float, float, float)
+ """
+ self.ensure_one()
+ if self.amount_select == 'fix':
+ try:
+ return self.amount_fix, float(safe_eval(self.quantity, localdict)), 100.0
+ except:
+ raise UserError(_('Wrong quantity defined for salary rule %s (%s).') % (self.name, self.code))
+ elif self.amount_select == 'percentage':
+ try:
+ return (float(safe_eval(self.amount_percentage_base, localdict)),
+ float(safe_eval(self.quantity, localdict)),
+ self.amount_percentage)
+ except:
+ raise UserError(_('Wrong percentage base or quantity defined for salary rule %s (%s).') % (self.name, self.code))
+ else:
+ try:
+ safe_eval(self.amount_python_compute, localdict, mode='exec', nocopy=True)
+ return float(localdict['result']), 'result_qty' in localdict and localdict['result_qty'] or 1.0, 'result_rate' in localdict and localdict['result_rate'] or 100.0
+ except:
+ raise UserError(_('Wrong python code defined for salary rule %s (%s).') % (self.name, self.code))
+
+ @api.multi
+ def satisfy_condition(self, localdict):
+ """
+ @param contract_id: id of hr.contract to be tested
+ @return: returns True if the given rule match the condition for the given contract. Return False otherwise.
+ """
+ self.ensure_one()
+
+ if self.condition_select == 'none':
+ return True
+ elif self.condition_select == 'range':
+ try:
+ result = safe_eval(self.condition_range, localdict)
+ return self.condition_range_min <= result and result <= self.condition_range_max or False
+ except:
+ raise UserError(_('Wrong range condition defined for salary rule %s (%s).') % (self.name, self.code))
+ else: # python code
+ try:
+ safe_eval(self.condition_python, localdict, mode='exec', nocopy=True)
+ return 'result' in localdict and localdict['result'] or False
+ except:
+ raise UserError(_('Wrong python condition defined for salary rule %s (%s).') % (self.name, self.code))
+
+
+class HrRuleInput(models.Model):
+ _name = 'hr.rule.input'
+ _description = 'Salary Rule Input'
+
+ name = fields.Char(string='Description', required=True)
+ code = fields.Char(required=True, help="The code that can be used in the salary rules")
+ input_id = fields.Many2one('hr.salary.rule', string='Salary Rule Input', required=True)
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index bb0c0e6c8ba..443d9c77588 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -9,3 +9,4 @@ access_hr_payslip_worked_days_officer,hr.payslip.worked_days.officer,model_hr_pa
access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,hr_payroll.group_hr_payroll_manager,1,1,1,1
access_hr_rule_input_officer,hr.rule.input.office,model_hr_rule_input,hr_payroll.group_hr_payroll_user,1,1,1,1
access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,hr_payroll.group_hr_payroll_user,1,1,1,1
+access_hr_contract_advantage_template,hr.contract.advantage.template.user,model_hr_contract_advantage_template,hr_payroll.group_hr_payroll_user,1,1,1,1
diff --git a/addons/hr_payroll/views/hr_contract_views.xml b/addons/hr_payroll/views/hr_contract_views.xml
new file mode 100644
index 00000000000..03d0b09cef2
--- /dev/null
+++ b/addons/hr_payroll/views/hr_contract_views.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+ hr.contract.view.form.inherit
+ hr.contract
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ hr.contract.advantage.template.form
+ hr.contract.advantage.template
+
+
+
+
+
+
+ hr.contract.advantage.template.tree
+ hr.contract.advantage.template
+
+
+
+
+
+
+
+
+
+
+
+
+ Contract Advantage Templates
+ hr.contract.advantage.template
+ form
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_payroll/views/hr_employee_views.xml b/addons/hr_payroll/views/hr_employee_views.xml
new file mode 100644
index 00000000000..20b765e6910
--- /dev/null
+++ b/addons/hr_payroll/views/hr_employee_views.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ payroll.hr.employee.view.form
+ hr.employee
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_payroll/views/res_config_views.xml b/addons/hr_payroll/views/hr_payroll_config_settings_views.xml
similarity index 100%
rename from addons/hr_payroll/views/res_config_views.xml
rename to addons/hr_payroll/views/hr_payroll_config_settings_views.xml
diff --git a/addons/hr_payroll/views/hr_payroll_views.xml b/addons/hr_payroll/views/hr_payroll_views.xml
deleted file mode 100644
index 306af34cb1e..00000000000
--- a/addons/hr_payroll/views/hr_payroll_views.xml
+++ /dev/null
@@ -1,741 +0,0 @@
-
-
-
-
-
-
-
-
-
- hr.contract.view.form.inherit
- hr.contract
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.payroll.structure.tree
- hr.payroll.structure
-
-
-
-
-
-
-
-
-
-
- hr.payroll.structure.tree
- hr.payroll.structure
- children_ids
-
-
-
-
-
-
-
-
-
-
- hr.payroll.structure.select
- hr.payroll.structure
-
-
-
-
-
-
-
-
- hr.payroll.structure.form
- hr.payroll.structure
-
-
-
-
-
-
- Salary Structures
- hr.payroll.structure
- form
-
-
-
-
- Salary Structures Hierarchy
- hr.payroll.structure
- tree
- [('parent_id','=',False)]
-
-
-
-
-
-
-
- hr.payslip.line.tree
- hr.payslip.line
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.payslip.line.form
- hr.payslip.line
-
-
-
-
-
-
- hr.payslip.line.select
- hr.payslip.line
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.payslip.tree
- hr.payslip
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hr.payslip.form
- hr.payslip
-
-
-
-
-
-
- hr.payslip.select
- hr.payslip
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Employee Payslips
- hr.payslip
- form
-
-
-
-
-
-
-
- hr.payslip
- Payslips
- form
- tree,form
- {'search_default_employee_id': [active_id], 'default_employee_id': active_id}
-
-
-
-
- payroll.hr.employee.view.form
- hr.employee
-
-
-
-
-
-
-
- hr.salary.rule.category.form
- hr.salary.rule.category
-
-
-
-
-
-
- hr.salary.rule.category.tree
- hr.salary.rule.category
-
-
-
-
-
-
-
-
-
- hr.salary.rule.category.tree.view
- hr.salary.rule.category
- children_ids
-
-
-
-
-
-
-
-
-
-
- hr.salary.rule.category.select
- hr.salary.rule.category
-
-
-
-
-
-
-
-
- Salary Rule Categories
- hr.salary.rule.category
- form
-
-
-
-
-
- Salary Rule Categories Hierarchy
- hr.salary.rule.category
- tree
- [('parent_id','=',False)]
-
-
-
-
-
-
- hr.contribution.register.tree
- hr.contribution.register
-
-
-
-
-
-
-
-
- hr.contribution.register.search
- hr.contribution.register
-
-
-
-
-
-
-
-
- hr.contribution.register.form
- hr.contribution.register
-
-
-
-
-
- Contribution Registers
- hr.contribution.register
- form
-
-
- Click to add a new contribution register.
-
- A contribution register is a third party involved in the salary
- payment of the employees. It can be the social security, the
- estate or anyone that collect or inject money on payslips.
-
+ A contribution register is a third party involved in the salary
+ payment of the employees. It can be the social security, the
+ estate or anyone that collect or inject money on payslips.
+
+
+
+
+
+
+
+
+
+ hr.salary.rule.list
+ hr.salary.rule
+
+
+
+
+
+
+
+
+
+
+
+
+ hr.salary.rule.tree
+ hr.salary.rule
+ child_ids
+
+
+
+
+
+
+
+
+
+
+
+ hr.salary.rule.form
+ hr.salary.rule
+
+
+
+
+
+
+ hr.salary.rule.select
+ hr.salary.rule
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Salary Rules
+ hr.salary.rule
+ form
+
+ [('parent_rule_id','=',False)]
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_recruitment/models/hr_job.py b/addons/hr_recruitment/models/hr_job.py
index 989b83ee6c0..e7648bcfe75 100644
--- a/addons/hr_recruitment/models/hr_job.py
+++ b/addons/hr_recruitment/models/hr_job.py
@@ -20,6 +20,7 @@ class Job(models.Model):
'hr.employee', related='department_id.manager_id', string="Department Manager",
readonly=True, store=True)
user_id = fields.Many2one('res.users', "Recruitment Responsible", track_visibility='onchange')
+ hr_responsible_id = fields.Many2one('res.users', "HR Responsible", track_visibility='onchange')
document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Applications")
documents_count = fields.Integer(compute='_compute_document_ids', string="Documents")
alias_id = fields.Many2one(
@@ -47,7 +48,7 @@ class Job(models.Model):
@api.multi
def _compute_application_count(self):
- read_group_result = self.env['hr.applicant'].read_group([('job_id', '=', self.id)], ['job_id'], ['job_id'])
+ read_group_result = self.env['hr.applicant'].read_group([('job_id', 'in', self.ids)], ['job_id'], ['job_id'])
result = dict((data['job_id'][0], data['job_id_count']) for data in read_group_result)
for job in self:
job.application_count = result.get(job.id, 0)
diff --git a/addons/hr_recruitment/models/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py
index 766fc4ccae9..f5e164a4aff 100644
--- a/addons/hr_recruitment/models/hr_recruitment.py
+++ b/addons/hr_recruitment/models/hr_recruitment.py
@@ -327,7 +327,7 @@ class Applicant(models.Model):
@api.multi
def _track_subtype(self, init_values):
record = self[0]
- if 'emp_id' in init_values and record.emp_id:
+ if 'emp_id' in init_values and record.emp_id and record.emp_id.active:
return 'hr_recruitment.mt_applicant_hired'
elif 'stage_id' in init_values and record.stage_id and record.stage_id.sequence <= 1:
return 'hr_recruitment.mt_applicant_new'
diff --git a/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml b/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
index 6890b520e97..54499005565 100644
--- a/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
@@ -26,7 +26,7 @@