audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] hr_commission: extended ahead of timesheet based commission

Browse Source 
* Allow invoice to see commission it is deriving amount for. This allows for basing on amounts that may depend on the employee or contract config.
* Prevent making commissions if the employee rate or admin rates are not set.
* Updated views to work in both CE and EE
This commit is contained in:
Jared Kipe
2022-01-31 16:22:18 -08:00
parent 39dcb66459
commit f5895e070b
3 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hr_commission/models/commission.py
View File

@@ -71,14 +71,14 @@ class Commission(models.Model):
elif commission.contract_id and commission.rate_type != 'manual':
if commission.rate_type == 'normal':
commission.rate = commission.contract_id.commission_rate
else:
elif commission.rate_type == 'admin':
commission.rate = commission.contract_id.admin_commission_rate
rounding = 2
if commission.source_move_id:
rounding = commission.source_move_id.company_currency_id.rounding
commission.base_total = commission.source_move_id.amount_total_signed
commission.base_amount = commission.source_move_id.amount_for_commission()
commission.base_amount = commission.source_move_id.amount_for_commission(commission)
amount = (commission.base_amount * commission.rate) / 100.0
if float_is_zero(amount, precision_rounding=rounding):
@@ -126,7 +126,7 @@ class Commission(models.Model):
else:
employee = employee_obj.search([('user_id', '=', move.user_id.id)], limit=1)
contract = employee.contract_id
if all((employee, contract)):
if all((employee, contract, contract.commission_rate)):
move.commission_ids += commission_obj.create({
'employee_id': employee.id,
'contract_id': contract.id,
@@ -139,7 +139,7 @@ class Commission(models.Model):
# Admin/Coach commission.
employee = employee.coach_id
contract = employee.contract_id
if all((employee, contract)):
if all((employee, contract, contract.admin_commission_rate)):
move.commission_ids += commission_obj.create({
'employee_id': employee.id,
'contract_id': contract.id,