[10.0] extract hr_expense_private_car (#36)
* remove private car stuff from hr_expense_usability * hr_private_car_expenses
This commit is contained in:
Stéphane Bidoul (ACSONE)
committed by
Alexis de Lattre
Alexis de Lattre
parent
19d2614feb
commit
a9d8137d1f
@@ -9,27 +9,6 @@ from odoo.tools import float_compare, float_is_zero
|
||||
import odoo.addons.decimal_precision as dp
|
||||
|
||||
|
||||
# I had to choose between several ideas when I developped this module :
|
||||
# 1) constraint on product_id in expense line
|
||||
# Idea : we put a constraint on the field product_id of the expense line
|
||||
# and, if it's a private_car_expense_ok=True product but it's not the private
|
||||
# car expense product of the employee, we block
|
||||
# Drawback : not convenient for the employee because he has to select the
|
||||
# right private car expense product by himself
|
||||
|
||||
# 2) single product, dedicated object for prices
|
||||
# Idea : we create only one "private car expense" product, and we
|
||||
# create a new object to store the price depending on the CV, etc...
|
||||
# Drawback : need to create a new object
|
||||
# => that's what is implemented in this module
|
||||
|
||||
# 3) single generic "My private car" product selectable by the user ;
|
||||
# several specific private car products NOT selectable by the user
|
||||
# Idea : When the user selects the generic "My private car" product,
|
||||
# it is automatically replaced by the specific one via the on_change
|
||||
# Drawback : decimal precision 'Product Price' on standard_price of product
|
||||
# (but we need 3)
|
||||
|
||||
class ProductTemplate(models.Model):
|
||||
_inherit = 'product.template'
|
||||
|
||||
@@ -84,64 +63,9 @@ class ProductProduct(models.Model):
|
||||
self.taxes_id = False
|
||||
|
||||
|
||||
class PrivateCarKmPrice(models.Model):
|
||||
_name = 'private.car.km.price'
|
||||
_description = 'Private Car Kilometer Price'
|
||||
_order = 'name'
|
||||
|
||||
name = fields.Char(required=True)
|
||||
unit_amount = fields.Float(
|
||||
string='Price per KM', digits=dp.get_precision('Expense Unit Price'),
|
||||
help='Price per kilometer in company currency.')
|
||||
company_id = fields.Many2one(
|
||||
'res.company', string='Company',
|
||||
default=lambda self: self.env['res.company']._company_default_get(
|
||||
'private.car.km.price'))
|
||||
active = fields.Boolean(default=True)
|
||||
|
||||
|
||||
class HrEmployee(models.Model):
|
||||
_inherit = 'hr.employee'
|
||||
|
||||
def compute_private_car_total_km_this_year(self):
|
||||
res = {}
|
||||
private_car_product_id = self.env.ref(
|
||||
'hr_expense_usability.generic_private_car_expense').id
|
||||
today = fields.Date.context_today(self)
|
||||
today_dt = fields.Date.from_string(today)
|
||||
self._cr.execute(
|
||||
"""
|
||||
SELECT el.employee_id, sum(el.quantity)
|
||||
FROM hr_expense el
|
||||
WHERE el.state NOT IN ('draft', 'cancel')
|
||||
AND el.employee_id IN %s
|
||||
AND el.product_id=%s
|
||||
AND EXTRACT(year FROM el.date) = %s
|
||||
GROUP BY el.employee_id
|
||||
""",
|
||||
(tuple(self.ids), private_car_product_id, today_dt.year))
|
||||
for line in self._cr.dictfetchall():
|
||||
res[line['employee_id']] = line['sum']
|
||||
for empl in self:
|
||||
empl.private_car_total_km_this_year = res.get(empl.id) or 0.0
|
||||
|
||||
private_car_plate = fields.Char(
|
||||
'Private Car Plate', size=32, copy=False, track_visibility='onchange',
|
||||
help="This field will be copied on the expenses of this employee.")
|
||||
private_car_km_price_id = fields.Many2one(
|
||||
'private.car.km.price', string='Private Car Price', copy=False,
|
||||
ondelete='restrict', track_visibility='onchange',
|
||||
help="This field will be copied on the expenses of this employee.")
|
||||
private_car_total_km_this_year = fields.Float(
|
||||
compute='compute_private_car_total_km_this_year',
|
||||
string="Total KM with Private Car This Year", readonly=True,
|
||||
help="Number of kilometers (KM) with private car for this "
|
||||
"employee in expenses in Approved, Waiting Payment or Paid "
|
||||
"state in the current civil year. This is usefull to check or "
|
||||
"estimate if the Private Car Product selected for this "
|
||||
"employee is compatible with the number of kilometers "
|
||||
"reimbursed to this employee during the civil year.")
|
||||
|
||||
def _get_accounting_partner_from_employee(self):
|
||||
# By default, odoo uses self.employee_id.address_home_id
|
||||
# which users usually don't configure
|
||||
@@ -172,15 +96,6 @@ class HrExpense(models.Model):
|
||||
# I want a specific precision for unit_amount of expense
|
||||
# main reason is KM cost which is 3 by default
|
||||
unit_amount = fields.Float(digits=dp.get_precision('Expense Unit Price'))
|
||||
private_car_plate = fields.Char(
|
||||
string='Private Car Plate', size=32, track_visibility='onchange',
|
||||
readonly=True, states={'draft': [('readonly', False)]})
|
||||
private_car_km_price_id = fields.Many2one(
|
||||
'private.car.km.price', string='Private Car Price', copy=False,
|
||||
ondelete='restrict', track_visibility='onchange',
|
||||
help="This field will be copied on the expenses of this employee.")
|
||||
# only for field visibility
|
||||
private_car_expense = fields.Boolean()
|
||||
tax_amount = fields.Monetary(
|
||||
string='Tax Amount', currency_field='currency_id',
|
||||
readonly=True, states={'draft': [('readonly', False)]})
|
||||
@@ -241,106 +156,11 @@ class HrExpense(models.Model):
|
||||
self.untaxed_amount_usability = total
|
||||
self.tax_amount = False
|
||||
|
||||
@api.onchange('product_id')
|
||||
def _onchange_product_id(self):
|
||||
private_car_product = self.env.ref(
|
||||
'hr_expense_usability.generic_private_car_expense')
|
||||
if (
|
||||
self.product_id and
|
||||
self.product_id == private_car_product and
|
||||
self.employee_id):
|
||||
if not self.employee_id.private_car_km_price_id:
|
||||
raise UserError(_(
|
||||
"Missing Private Car Km Price on the configuration of "
|
||||
"the employee '%s'.") % self.employee_id.display_name)
|
||||
if not self.employee_id.private_car_plate:
|
||||
raise UserError(_(
|
||||
"Missing Private Car Plate on the configuration of "
|
||||
"the employee '%s'.") % self.employee_id.display_name)
|
||||
self.private_car_expense = True
|
||||
self.currency_id = self.company_id.currency_id
|
||||
self.private_car_plate = self.employee_id.private_car_plate
|
||||
self.private_car_km_price_id =\
|
||||
self.employee_id.private_car_km_price_id
|
||||
else:
|
||||
self.private_car_expense = False
|
||||
self.private_car_plate = False
|
||||
self.private_car_km_price_id = False
|
||||
return super(HrExpense, self)._onchange_product_id()
|
||||
|
||||
@api.onchange('private_car_km_price_id')
|
||||
def _onchange_private_car_km_price_id(self):
|
||||
if self.private_car_km_price_id and self.employee_id:
|
||||
self.unit_amount =\
|
||||
self.employee_id.private_car_km_price_id.unit_amount
|
||||
|
||||
@api.onchange('unit_amount')
|
||||
def _onchange_unit_amount(self):
|
||||
res = {}
|
||||
if self.private_car_expense:
|
||||
original_unit_amount = self.private_car_km_price_id.unit_amount
|
||||
prec = self.env['decimal.precision'].precision_get(
|
||||
'Expense Unit Price')
|
||||
if float_compare(
|
||||
original_unit_amount, self.unit_amount,
|
||||
precision_digits=prec):
|
||||
if self.env.user.has_group('account.group_account_manager'):
|
||||
res['warning'] = {
|
||||
'title': _('Warning - Private Car Expense'),
|
||||
'message': _(
|
||||
"You should not change the unit price "
|
||||
"for private car expenses. You should change "
|
||||
"the Private Car Product or update the Cost "
|
||||
"Price of the selected Private Car Product "
|
||||
"and re-create the Expense.\n\nBut, as "
|
||||
"you are in the group 'Account Manager', we "
|
||||
"suppose that you know what you are doing, "
|
||||
"so the original unit amount (%s) is not "
|
||||
"restored.") % original_unit_amount,
|
||||
}
|
||||
else:
|
||||
res['warning'] = {
|
||||
'title': _('Warning - Private Car Expense'),
|
||||
'message': _(
|
||||
"You should not change the unit price "
|
||||
"for private car expenses. The original unit "
|
||||
"amount has been restored.\n\nOnly users in "
|
||||
"the 'Account Manager' group are allowed to "
|
||||
"change the unit amount for private car "
|
||||
"expenses manually.")}
|
||||
res['value'] = {'unit_amount': original_unit_amount}
|
||||
return res
|
||||
|
||||
@api.constrains(
|
||||
'product_id', 'private_car_plate', 'payment_mode', 'tax_ids',
|
||||
'product_id', 'payment_mode', 'tax_ids',
|
||||
'untaxed_amount_usability', 'tax_amount', 'quantity', 'unit_amount')
|
||||
def _check_expense(self):
|
||||
generic_private_car_product = self.env.ref(
|
||||
'hr_expense_usability.generic_private_car_expense')
|
||||
for exp in self:
|
||||
if exp.product_id == generic_private_car_product:
|
||||
if not exp.private_car_plate:
|
||||
raise ValidationError(_(
|
||||
"Missing 'Private Car Plate' on the "
|
||||
"expense '%s' of employee '%s'.")
|
||||
% (exp.name, exp.employee_id.display_name))
|
||||
if not exp.private_car_km_price_id:
|
||||
raise ValidationError(_(
|
||||
"Missing 'Private Car Km Price' on the "
|
||||
"expense '%s'.") % exp.name)
|
||||
if exp.currency_id != exp.company_id.currency_id:
|
||||
raise ValidationError(_(
|
||||
"The expense '%s' is a private car expense, "
|
||||
"so the currency of this expense (%s) should "
|
||||
"be the currency of the company (%s).") % (
|
||||
exp.name,
|
||||
exp.currency_id.name,
|
||||
exp.company_id.currency_id.name))
|
||||
if exp.tax_ids:
|
||||
raise ValidationError(_(
|
||||
"The expense '%s' is a private car expense "
|
||||
"so it shouldn't have taxes.")
|
||||
% exp.name)
|
||||
if exp.tax_ids:
|
||||
if len(exp.tax_ids) > 1:
|
||||
raise ValidationError(_(
|
||||
|
||||
Reference in New Issue
Block a user