[MIG] hr_payroll_gamification: to 15.0

hr_payroll_gamification/__manifest__.py

@@ -1,7 +1,7 @@
 {
     'name': 'Payroll Gamification',
     'description': 'Payroll Gamification',
-    'version': '13.0.1.0.1',
+    'version': '15.0.1.0.0',
     'website': 'https://hibou.io/',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'license': 'AGPL-3',
@@ -15,6 +15,6 @@
     ],
     'depends': [
         'hr_gamification',
-        'hr_payroll',
+        'hr_payroll_hibou',
     ],
 }

hr_payroll_gamification/data/payroll_demo.xml

@@ -3,9 +3,13 @@
 
     <record id="hr_salary_rule_gamification" model="hr.salary.rule">
         <field name="condition_select">python</field>
-        <field name="condition_python">result = inputs.BADGES.amount > 0.0 if inputs.BADGES else False</field>
+        <field name="condition_python">
+result = inputs.BADGES.amount > 0.0 if inputs.BADGES else False
+        </field>
         <field name="amount_select">code</field>
-        <field name="amount_python_compute">result = inputs.BADGES.amount if inputs.BADGES else 0</field>
+        <field name="amount_python_compute">
+result = inputs.BADGES.amount if inputs.BADGES else 0
+        </field>
         <field name="code">BADGES</field>
         <field name="category_id" ref="hr_payroll.BASIC"/>
         <field name="name">Badges</field>

hr_payroll_gamification/models/payroll.py

@@ -1,32 +1,29 @@
-from odoo import api, fields, models
+from odoo import api, Command, fields, models
 
 
 class Payslip(models.Model):
     _inherit = 'hr.payslip'
-
+    
-    @api.onchange('employee_id', 'struct_id', 'contract_id', 'date_from', 'date_to')
+    @api.depends('employee_id', 'contract_id', 'struct_id', 'date_from', 'date_to', 'struct_id')
-    def _onchange_employee(self):
+    def _compute_input_line_ids(self):
-        res = super()._onchange_employee()
+        res = super()._compute_input_line_ids()
-        if self.state == 'draft':
-            self._input_badges()
-        return res
-
-    def _input_badges(self):
         badge_type = self.env.ref('hr_payroll_gamification.badge_other_input', raise_if_not_found=False)
         if not badge_type:
-            return
+            return res
-
+        for slip in self:
-        amount = self._get_input_badges()
+            amount = slip._get_input_badges()
-        if not amount:
+            if not amount:
-            return
+                continue
-
+            slip.update({
-        lines_to_keep = self.input_line_ids.filtered(lambda x: x.input_type_id != badge_type)
+                'input_line_ids': [
-        input_lines_vals = [(5, 0, 0)] + [(4, line.id, False) for line in lines_to_keep]
+                    Command.create({
-        input_lines_vals.append((0, 0, {
+                        'name': badge_type.name or 'Badges',
-            'amount': amount,
+                        'amount': amount,
-            'input_type_id': badge_type,
+                        'input_type_id': badge_type.id,
-        }))
+                    }),
-        self.update({'input_line_ids': input_lines_vals})
+                ],
+            })
+        return res
 
     def _get_input_badges(self):
         amount = 0.0

hr_payroll_gamification/tests/test_payroll_badge.py

@@ -1,32 +1,19 @@
-from odoo.tests import common
+from odoo.addons.hr_payroll_hibou.tests import common
 from odoo import fields
 from datetime import date
 
 
-class TestPayroll(common.TransactionCase):
+class TestPayslip(common.TestPayslip):
 
     def setUp(self):
-        super(TestPayroll, self).setUp()
+        super(TestPayslip, self).setUp()
-        self.wage = 21.50
+        self.wage = 2000.00
-        self.employee = self.env['hr.employee'].create({
+        self.structure = self.env.ref('hr_payroll.structure_002')
-            'birthday': '1985-03-14',
+        self.structure_type = self.structure.type_id
-            'country_id': self.ref('base.us'),
+        self.structure_type.wage_type = 'monthly'
-            'department_id': self.ref('hr.dep_rd'),
+        self.employee = self._createEmployee()
-            'gender': 'male',
+        self.employee.user_id = self.env.user
-            'name': 'Jared',
+        self.contract = self._createContract(self.employee, wage=self.wage)
-            'user_id': self.env.user.id,
-        })
-        self.contract = self.env['hr.contract'].create({
-            'name': 'test',
-            'employee_id': self.employee.id,
-            'type_id': self.ref('hr_contract.hr_contract_type_emp'),
-            'struct_id': self.ref('hr_payroll.structure_base'),
-            'resource_calendar_id': self.ref('resource.resource_calendar_std'),
-            'wage': self.wage,
-            'date_start': '2018-01-01',
-            'state': 'open',
-            'schedule_pay': 'monthly',
-        })
 
     def test_badge_amounts(self):
         badge = self.env['gamification.badge'].create({
@@ -37,17 +24,13 @@ class TestPayroll(common.TransactionCase):
     def test_badge_payroll(self):
         additional_wage = 5.0
         additional_wage_period = 15.0
-        payslip = self.env['hr.payslip'].create({
+        payslip = self._createPayslip(self.employee,
-            'employee_id': self.employee.id,
+                                      '2018-01-01',
-            'contract_id': self.contract.id,
+                                      '2018-01-31',
-            'date_from': '2018-01-01',
+                                      )
-            'date_to': '2018-01-31',
-        })
-        self.assertEqual(payslip._get_input_badges(self.contract, date(2018, 1, 1), date(2018, 1, 31)), 0.0)
         payslip.compute_sheet()
-        basic = payslip.details_by_salary_rule_category.filtered(lambda l: l.code == 'GROSS')
+        cats = self._getCategories(payslip)
-        self.assertTrue(basic)
+        self.assertEqual(cats['BASIC'], self.wage)
-        self.assertEqual(basic.total, self.wage)
 
         badge = self.env['gamification.badge'].create({
             'name': 'test',
@@ -79,44 +62,25 @@ class TestPayroll(common.TransactionCase):
         self.assertEqual(self.employee.badge_ids, badge_user + badge_user_period)
 
         # Includes only one badge
-        payslip = self.env['hr.payslip'].create({
+        payslip = self._createPayslip(self.employee,
-            'employee_id': self.employee.id,
+                                      '2018-01-01',
-            'date_from': '2018-01-01',
+                                      '2018-01-31',)
-            'date_to': '2018-01-31',
-        })
-        # This is crazy, but...
-        res = payslip.onchange_employee_id(date(2018, 1, 1), date(2018, 1, 31), employee_id=self.employee.id, contract_id=self.contract.id)
-        del res['value']['line_ids']
-        res['value']['input_line_ids'] = [(0, 0, l) for l in res['value']['input_line_ids']]
-        res['value']['worked_days_line_ids'] = [(0, 0, l) for l in res['value']['worked_days_line_ids']]
-        payslip.write(res['value'])
         self.assertTrue(payslip.input_line_ids)
+        input_line = payslip.input_line_ids.filtered(lambda l: l.name == 'Badges')
+        self.assertTrue(input_line)
+        self.assertEqual(input_line.amount, additional_wage)
         payslip.compute_sheet()
+        cats = self._getCategories(payslip)
+        self.assertEqual(cats['BASIC'], self.wage + additional_wage)
 
-        self.assertEqual(payslip._get_input_badges(self.contract, date(2018, 1, 1), date(2018, 1, 31)), additional_wage)
+         
-
-        basic = payslip.details_by_salary_rule_category.filtered(lambda l: l.code == 'GROSS')
-        self.assertTrue(basic)
-        self.assertEqual(basic.total, self.wage + additional_wage)
-
         # Include both Badges
-        payslip = self.env['hr.payslip'].create({
+        payslip = self._createPayslip(self.employee,
-            'employee_id': self.employee.id,
+                                '2018-02-01',
-            'date_from': '2018-02-01',
+                                '2018-02-25',)
-            'date_to': '2018-02-25',  # Feb...
+        input_line = payslip.input_line_ids.filtered(lambda l: l.name == 'Badges')
-        })
+        self.assertTrue(input_line)
-        # This is crazy, but...
+        self.assertEqual(input_line.amount, additional_wage + additional_wage_period)
-        res = payslip.onchange_employee_id(date(2018, 2, 1), date(2018, 2, 25), employee_id=self.employee.id,
-                                           contract_id=self.contract.id)
-        del res['value']['line_ids']
-        res['value']['input_line_ids'] = [(0, 0, l) for l in res['value']['input_line_ids']]
-        res['value']['worked_days_line_ids'] = [(0, 0, l) for l in res['value']['worked_days_line_ids']]
-        payslip.write(res['value'])
-        self.assertTrue(payslip.input_line_ids)
         payslip.compute_sheet()
-
+        cats = self._getCategories(payslip)
-        self.assertEqual(payslip._get_input_badges(self.contract, date(2018, 2, 1), date(2018, 2, 25)), additional_wage + additional_wage_period)
+        self.assertEqual(cats['BASIC'], self.wage + additional_wage + additional_wage_period)
-
-        basic = payslip.details_by_salary_rule_category.filtered(lambda l: l.code == 'GROSS')
-        self.assertTrue(basic)
-        self.assertEqual(basic.total, self.wage + additional_wage + additional_wage_period)