From 5b7043dccf7f2c0c14488287525c06b43bd33a0e Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Fri, 3 Jul 2020 08:42:56 -0700
Subject: [PATCH] [MOV] hr_payroll_commission: from Hibou Suite Enterprise for
 13.0

---
 hr_payroll_commission/__init__.py             |   3 +
 hr_payroll_commission/__manifest__.py         |  29 ++++++++
 .../data/hr_payroll_commission_data.xml       |   9 +++
 .../data/hr_payroll_commission_demo.xml       |  20 ++++++
 hr_payroll_commission/models/__init__.py      |   4 ++
 hr_payroll_commission/models/hr_commission.py |  13 ++++
 hr_payroll_commission/models/hr_payslip.py    |  63 ++++++++++++++++++
 .../static/description/icon.png               | Bin 0 -> 6985 bytes
 hr_payroll_commission/tests/__init__.py       |   3 +
 .../tests/test_payslip_commission.py          |  37 ++++++++++
 .../views/hr_commission_views.xml             |  23 +++++++
 .../views/hr_payslip_views.xml                |  20 ++++++
 12 files changed, 224 insertions(+)
 create mode 100644 hr_payroll_commission/__init__.py
 create mode 100644 hr_payroll_commission/__manifest__.py
 create mode 100644 hr_payroll_commission/data/hr_payroll_commission_data.xml
 create mode 100644 hr_payroll_commission/data/hr_payroll_commission_demo.xml
 create mode 100644 hr_payroll_commission/models/__init__.py
 create mode 100644 hr_payroll_commission/models/hr_commission.py
 create mode 100644 hr_payroll_commission/models/hr_payslip.py
 create mode 100644 hr_payroll_commission/static/description/icon.png
 create mode 100755 hr_payroll_commission/tests/__init__.py
 create mode 100644 hr_payroll_commission/tests/test_payslip_commission.py
 create mode 100644 hr_payroll_commission/views/hr_commission_views.xml
 create mode 100644 hr_payroll_commission/views/hr_payslip_views.xml

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..7ac30f0c
--- /dev/null
+++ b/hr_payroll_commission/__manifest__.py
@@ -0,0 +1,29 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Commissions in Payslips',
+    'author': 'Hibou Corp.',
+    'version': '13.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',
+        'data/hr_payroll_commission_data.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_data.xml b/hr_payroll_commission/data/hr_payroll_commission_data.xml
new file mode 100644
index 00000000..a666f821
--- /dev/null
+++ b/hr_payroll_commission/data/hr_payroll_commission_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Salary Other Input -->
+    <record id="commission_other_input" model="hr.payslip.input.type">
+        <field name="name">Commissions</field>
+        <field name="code">COMMISSION</field>
+    </record>
+
+</odoo>
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..77e8ccfa
--- /dev/null
+++ b/hr_payroll_commission/data/hr_payroll_commission_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_salary_rule_commission" model="hr.salary.rule">
+        <field name="condition_select">python</field>
+        <field name="condition_python">
+result = inputs.COMMISSION.amount > 0.0 if inputs.COMMISSION else False
+        </field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">
+result = inputs.COMMISSION.amount if inputs.COMMISSION else 0
+        </field>
+        <field name="code">COMMISSION</field>
+        <field name="category_id" ref="hr_payroll.BASIC"/>
+        <field name="name">Commissions</field>
+        <field name="sequence" eval="190"/>
+        <field name="struct_id" ref="hr_payroll.structure_002"/>
+    </record>
+
+</odoo>
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..510afdd7
--- /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_type = self.env.ref('hr_payroll_commission.commission_other_input', raise_if_not_found=False)
+        if not self.input_line_ids.filtered(lambda line: line.input_type_id == commission_type):
+            self.commission_payment_ids.write({'payslip_id': False})
+
+    @api.onchange('employee_id', 'struct_id', 'contract_id', 'date_from', 'date_to')
+    def _onchange_employee(self):
+        res = super()._onchange_employee()
+        if self.state == 'draft':
+            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_type = self.env.ref('hr_payroll_commission.commission_other_input', raise_if_not_found=False)
+        if not commission_type:
+            return
+
+        total = sum(self.commission_payment_ids.mapped('commission_amount'))
+        if not total:
+            return
+
+        lines_to_keep = self.input_line_ids.filtered(lambda x: x.input_type_id != commission_type)
+        input_lines_vals = [(5, 0, 0)] + [(4, line.id, False) for line in lines_to_keep]
+        input_lines_vals.append((0, 0, {
+            'amount': total,
+            'input_type_id': commission_type.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 0000000000000000000000000000000000000000..9ccbaed5c46a5dbe718c4f7945b1b4a7cb929bb4
GIT binary patch
literal 6985
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
BYC8Y`

literal 0
HcmV?d00001

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..0e1dcc17
--- /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_type = self.env.ref('hr_payroll_commission.commission_other_input')
+        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.input_type_id == commission_type)
+        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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_hr_commission_payment_form_inherit" model="ir.ui.view">
+        <field name="name">hr.expense.sheet.view.form.payroll</field>
+        <field name="model">hr.commission.payment</field>
+        <field name="inherit_id" ref="hr_commission.view_hr_commission_payment_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='employee_id']" position="after">
+                <field name="pay_in_payslip" attrs="{'invisible': ['|', ('pay_in_payslip', '=', False), ('payslip_id', '!=', False)]}"/>
+                <field name="payslip_id" attrs="{'invisible':[('payslip_id','=',False)]}"/>
+            </xpath>
+            <xpath expr="//form/header" position="inside">
+                <button name="action_report_in_next_payslip" type="object"
+                        string="Report in Next Payslip"
+                        groups="account.group_account_manager"
+                        attrs="{'invisible': ['|', ('pay_in_payslip', '=', True), ('payslip_id', '!=', False)]}"
+                        class="oe_highlight"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/hr_payroll_commission/views/hr_payslip_views.xml b/hr_payroll_commission/views/hr_payslip_views.xml
new file mode 100644
index 00000000..aa3717fb
--- /dev/null
+++ b/hr_payroll_commission/views/hr_payslip_views.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="hr_payslip_view_form_inherit" model="ir.ui.view">
+        <field name="name">hr.payslip.view.form.inherit</field>
+        <field name="model">hr.payslip</field>
+        <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button class="oe_stat_button" name="open_commissions" type="object" icon="fa-dollar" attrs="{'invisible': [('commission_count', '=', 0)]}">
+                    <field string="Commissions" name="commission_count" widget="statinfo"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='number']" position="after">
+                <field name="commission_payment_ids" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>