Merge PR OCA#650 into 12.0

Signed-off-by pedrobaeza
ursais · Jul 30, 2019 · 29ad35e · 29ad35e
2 parents c2815e2 + eb74325
commit 29ad35e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/hr_holidays_notify_employee_manager/README.rst b/hr_holidays_notify_employee_manager/README.rst
@@ -75,6 +75,7 @@ Contributors
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
+* Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/hr_holidays_notify_employee_manager/readme/CONTRIBUTORS.rst b/hr_holidays_notify_employee_manager/readme/CONTRIBUTORS.rst
@@ -3,3 +3,4 @@
 * Dennis Sluijk <d.sluijk@onestein.nl>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 * Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
+* Alexey Pelykh <alexey.pelykh@brainbeanapps.com>
diff --git a/hr_holidays_notify_employee_manager/static/description/index.html b/hr_holidays_notify_employee_manager/static/description/index.html
@@ -424,6 +424,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 <li>Nikul Chaudhary &lt;<a class="reference external" href="mailto:nikul.chaudhary.serpentcs&#64;gmail.com">nikul.chaudhary.serpentcs&#64;gmail.com</a>&gt;</li>
+<li>Alexey Pelykh &lt;<a class="reference external" href="mailto:alexey.pelykh&#64;brainbeanapps.com">alexey.pelykh&#64;brainbeanapps.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/hr_holidays_notify_employee_manager/tests/test_hr_holiday_notify_employee_manager.py b/hr_holidays_notify_employee_manager/tests/test_hr_holiday_notify_employee_manager.py
@@ -1,4 +1,5 @@
 # Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2019 Brainbean Apps (https://brainbeanapps.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo.tests.common import TransactionCase
@@ -29,7 +30,17 @@ def setUp(self):
             'name': 'Test employee',
             'user_id': self.user.id,
             'parent_id': self.emp_manager.id})
-        self.holiday_type = self.type_model.create({'name': 'Leave'})
+        self.holiday_type = self.type_model.create({
+            'name': 'Leave',
+            'allocation_type': 'fixed',
+        })
+        self.env['hr.leave.allocation'].create({
+            'holiday_type': 'employee',
+            'employee_id': self.employee.id,
+            'holiday_status_id': self.holiday_type.id,
+            'state': 'validate',
+            'number_of_days': 1.0,
+        })
 
     def test_add_follower_1(self):
         """Tests if the employee's manager is added as follower to the leave