diff --git a/hr_commission/tests/test_commission.py b/hr_commission/tests/test_commission.py index b42c8e1f..8e2e4d02 100644 --- a/hr_commission/tests/test_commission.py +++ b/hr_commission/tests/test_commission.py @@ -5,6 +5,11 @@ from odoo.tests import common class TestCommission(common.TransactionCase): + def setUp(self): + super().setUp() + self.user = self.browse_ref('base.user_demo') + self.employee = self.browse_ref('hr.employee_qdp') # This is the employee associated with above user. + def _createUser(self): return self.env['res.users'].create({ 'name': 'Coach', @@ -23,6 +28,12 @@ class TestCommission(common.TransactionCase): }) def _createContract(self, employee, commission_rate, admin_commission_rate=0.0): + other_contracts = self.env['hr.contract'].search([('employee_id', '=', employee.id)]) + if other_contracts: + # couldn't get the demo contract to not be used if it is + # installed e.g. by payroll... + # tried, state->cancel + employee.invalidate_cache() etc. + other_contracts.unlink() return self.env['hr.contract'].create({ 'date_start': '2016-01-01', 'date_end': '2030-12-31', @@ -47,8 +58,8 @@ class TestCommission(common.TransactionCase): coach = self._createEmployee(self.browse_ref('base.user_root')) coach_contract = self._createContract(coach, 12.0, admin_commission_rate=2.0) - user = self.browse_ref('base.user_demo') - emp = self.browse_ref('hr.employee_qdp') # This is the employee associated with above user. + user = self.user + emp = self.employee emp.address_home_id = user.partner_id # Important field for payables. emp.coach_id = coach @@ -62,9 +73,12 @@ class TestCommission(common.TransactionCase): inv.action_invoice_open() # validate self.assertEqual(inv.state, 'open') self.assertTrue(inv.commission_ids, 'Commissions not created when invoice is validated.') + self.assertTrue(inv.amount_for_commission()) user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id) self.assertEqual(len(user_commission), 1, 'Incorrect commission count %d (expect 1)' % len(user_commission)) + self.assertTrue(user_commission.rate) + self.assertTrue(user_commission.amount) self.assertEqual(user_commission.state, 'draft', 'Commission is not draft.') self.assertFalse(user_commission.move_id, 'Commission has existing journal entry.') diff --git a/hr_payroll_commission/__init__.py b/hr_payroll_commission/__init__.py new file mode 100644 index 00000000..09434554 --- /dev/null +++ b/hr_payroll_commission/__init__.py @@ -0,0 +1,3 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +from . import models diff --git a/hr_payroll_commission/__manifest__.py b/hr_payroll_commission/__manifest__.py new file mode 100644 index 00000000..00e2cb32 --- /dev/null +++ b/hr_payroll_commission/__manifest__.py @@ -0,0 +1,28 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +{ + 'name': 'Commissions in Payslips', + 'author': 'Hibou Corp.', + 'version': '12.0.1.0.0', + 'license': 'OPL-1', + 'category': 'Accounting/Commissions', + 'sequence': 95, + 'summary': 'Reimburse Commissions in Payslips', + 'description': """ +Reimburse Commissions in Payslips + """, + 'depends': [ + 'hr_commission', + 'hr_payroll', + ], + 'data': [ + 'views/hr_commission_views.xml', + 'views/hr_payslip_views.xml', + ], + 'demo': [ + 'data/hr_payroll_commission_demo.xml', + ], + 'installable': True, + 'application': False, + 'auto_install': True, +} diff --git a/hr_payroll_commission/data/hr_payroll_commission_demo.xml b/hr_payroll_commission/data/hr_payroll_commission_demo.xml new file mode 100644 index 00000000..b7d42acd --- /dev/null +++ b/hr_payroll_commission/data/hr_payroll_commission_demo.xml @@ -0,0 +1,23 @@ + + + + + python + +result = inputs.COMMISSION.amount > 0.0 if inputs.COMMISSION else False + + code + +result = inputs.COMMISSION.amount if inputs.COMMISSION else 0 + + COMMISSION + + Commissions + + + + + + + + diff --git a/hr_payroll_commission/models/__init__.py b/hr_payroll_commission/models/__init__.py new file mode 100644 index 00000000..ba3bcc23 --- /dev/null +++ b/hr_payroll_commission/models/__init__.py @@ -0,0 +1,4 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +from . import hr_commission +from . import hr_payslip diff --git a/hr_payroll_commission/models/hr_commission.py b/hr_payroll_commission/models/hr_commission.py new file mode 100644 index 00000000..3cd127ff --- /dev/null +++ b/hr_payroll_commission/models/hr_commission.py @@ -0,0 +1,13 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +from odoo import fields, models, _ + + +class CommissionPayment(models.Model): + _inherit = 'hr.commission.payment' + + pay_in_payslip = fields.Boolean(string="Reimburse In Next Payslip") + payslip_id = fields.Many2one('hr.payslip', string="Payslip", readonly=True) + + def action_report_in_next_payslip(self): + self.filtered(lambda p: not p.payslip_id).write({'pay_in_payslip': True}) diff --git a/hr_payroll_commission/models/hr_payslip.py b/hr_payroll_commission/models/hr_payslip.py new file mode 100644 index 00000000..1ae1f72b --- /dev/null +++ b/hr_payroll_commission/models/hr_payslip.py @@ -0,0 +1,63 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +from odoo import api, fields, models, _ + + +class HrPayslip(models.Model): + _inherit = 'hr.payslip' + + commission_payment_ids = fields.One2many( + 'hr.commission.payment', 'payslip_id', string='Commissions', + help="Commissions to reimburse to employee.", + states={'draft': [('readonly', False)], 'verify': [('readonly', False)]}) + commission_count = fields.Integer(compute='_compute_commission_count') + + @api.depends('commission_payment_ids.commission_ids', 'commission_payment_ids.payslip_id') + def _compute_commission_count(self): + for payslip in self: + payslip.commission_count = len(payslip.mapped('commission_payment_ids.commission_ids')) + + @api.onchange('input_line_ids') + def _onchange_input_line_ids(self): + commission_code = 'COMMISSION' + if not self.input_line_ids.filtered(lambda line: line.code == commission_code): + self.commission_payment_ids.write({'payslip_id': False}) + + @api.onchange('employee_id', 'date_from', 'date_to', 'contract_id') + def onchange_employee(self): + res = super().onchange_employee() + if self.state == 'draft' and self.contract_id: + self.commission_payment_ids = self.env['hr.commission.payment'].search([ + ('employee_id', '=', self.employee_id.id), + ('pay_in_payslip', '=', True), + ('payslip_id', '=', False)]) + self._onchange_commission_payment_ids() + return res + + @api.onchange('commission_payment_ids') + def _onchange_commission_payment_ids(self): + commission_code = 'COMMISSION' + + total = sum(self.commission_payment_ids.mapped('commission_amount')) + if not total: + return + + lines_to_keep = self.input_line_ids.filtered(lambda x: x.code != commission_code) + input_lines_vals = [(5, 0, 0)] + [(4, line.id, False) for line in lines_to_keep] + input_lines_vals.append((0, 0, { + 'amount': total, + 'name': 'Commissions', + 'code': commission_code, + 'contract_id': self.contract_id.id, + })) + self.update({'input_line_ids': input_lines_vals}) + + def open_commissions(self): + self.ensure_one() + return { + 'type': 'ir.actions.act_window', + 'name': _('Reimbursed Commissions'), + 'res_model': 'hr.commission', + 'view_mode': 'tree,form', + 'domain': [('id', 'in', self.mapped('commission_payment_ids.commission_ids').ids)], + } diff --git a/hr_payroll_commission/static/description/icon.png b/hr_payroll_commission/static/description/icon.png new file mode 100644 index 00000000..9ccbaed5 Binary files /dev/null and b/hr_payroll_commission/static/description/icon.png differ diff --git a/hr_payroll_commission/tests/__init__.py b/hr_payroll_commission/tests/__init__.py new file mode 100755 index 00000000..0ce84cbf --- /dev/null +++ b/hr_payroll_commission/tests/__init__.py @@ -0,0 +1,3 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +from . import test_payslip_commission diff --git a/hr_payroll_commission/tests/test_payslip_commission.py b/hr_payroll_commission/tests/test_payslip_commission.py new file mode 100644 index 00000000..ce188757 --- /dev/null +++ b/hr_payroll_commission/tests/test_payslip_commission.py @@ -0,0 +1,37 @@ +# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details. + +from datetime import date, timedelta + +from odoo.addons.hr_commission.tests import test_commission + + +class TestCommissionPayslip(test_commission.TestCommission): + + def test_commission(self): + super().test_commission() + commission_code = 'COMMISSION' + payslip = self.env['hr.payslip'].create({ + 'name': 'test slip', + 'employee_id': self.employee.id, + 'date_from': date.today() - timedelta(days=1), + 'date_to': date.today() + timedelta(days=14), + }) + payslip.onchange_employee() + self.assertFalse(payslip.commission_payment_ids) + + # find unpaid commission payments from super().test_commission() + commission_payments = self.env['hr.commission.payment'].search([ + ('employee_id', '=', self.employee.id), + ]) + self.assertTrue(commission_payments) + + # press the button to pay it via payroll + commission_payments.action_report_in_next_payslip() + + payslip.onchange_employee() + # has attached commission payments + self.assertTrue(payslip.commission_payment_ids) + commission_input_lines = payslip.input_line_ids.filtered(lambda l: l.code == commission_code) + self.assertTrue(commission_input_lines) + self.assertEqual(sum(commission_input_lines.mapped('amount')), + sum(commission_payments.mapped('commission_amount'))) diff --git a/hr_payroll_commission/views/hr_commission_views.xml b/hr_payroll_commission/views/hr_commission_views.xml new file mode 100644 index 00000000..cbc1cb27 --- /dev/null +++ b/hr_payroll_commission/views/hr_commission_views.xml @@ -0,0 +1,23 @@ + + + + + hr.expense.sheet.view.form.payroll + hr.commission.payment + + + + + + + + + + + + + + + +