Skip to content

Commit 245aaf7

Browse files
[MIG] hr_holidays_summary_email: Migration to 18.0
1 parent fb251be commit 245aaf7

File tree

8 files changed

+20
-22
lines changed

8 files changed

+20
-22
lines changed

hr_holidays_summary_email/README.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ Contributors
7777

7878
- Jordi Masvidal
7979

80+
- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
81+
82+
- Bhavesh Heliconia
83+
8084
Maintainers
8185
-----------
8286

hr_holidays_summary_email/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"summary": """
77
Notify employees with daily or weekly leaves summaries of their company.
88
""",
9-
"version": "16.0.1.0.0",
9+
"version": "18.0.1.0.0",
1010
"category": "Human Resources",
1111
"website": "https://github.com/OCA/hr-holidays",
1212
"author": "ForgeFlow, Odoo Community Association (OCA)",

hr_holidays_summary_email/data/ir_cron.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<field name="user_id" ref="base.user_root" />
77
<field name="interval_number">1</field>
88
<field name="interval_type">days</field>
9-
<field name="numbercall">-1</field>
10-
<field eval="False" name="doall" />
119
<field name="model_id" ref="model_hr_leave" />
1210
<field name="state">code</field>
1311
<field name="code">model._cron_send_hr_leave_summary_emails()</field>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
- ForgeFlow \<http://www.forgeflow.com\>
22

33
> - Jordi Masvidal
4+
- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
5+
- Bhavesh Heliconia

hr_holidays_summary_email/static/description/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,11 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
426426
</ul>
427427
</blockquote>
428428
</li>
429+
<li><p class="first"><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a></p>
430+
<ul class="simple">
431+
<li>Bhavesh Heliconia</li>
432+
</ul>
433+
</li>
429434
</ul>
430435
</div>
431436
<div class="section" id="maintainers">

hr_holidays_summary_email/tests/test_hr_leave_summary_email.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
from dateutil.relativedelta import relativedelta
66

7-
from odoo.tests import common
7+
from odoo.addons.base.tests.common import BaseCommon
88

99

10-
class TestHrLeaveSummaryEmail(common.TransactionCase):
10+
class TestHrLeaveSummaryEmail(BaseCommon):
1111
@classmethod
1212
def setUpClass(cls):
1313
super().setUpClass()
@@ -16,17 +16,9 @@ def setUpClass(cls):
1616
# Add allocation days for the test
1717
leave_type.write({"requires_allocation": "no"})
1818
calendar = cls.env.ref("resource.resource_calendar_std")
19-
partner = cls.env["res.partner"].create(
20-
{
21-
"name": "Test employee",
22-
"type": "private",
23-
"country_id": cls.env.ref("base.es").id,
24-
}
25-
)
2619
cls.employee = cls.env["hr.employee"].create(
2720
{
2821
"name": "Test employee",
29-
"address_home_id": partner.id,
3022
"resource_calendar_id": calendar.id,
3123
}
3224
)
@@ -39,8 +31,8 @@ def setUpClass(cls):
3931
"name": "Test 1",
4032
"employee_id": cls.employee.id,
4133
"holiday_status_id": leave_type.id,
42-
"date_from": datetime.today(),
43-
"date_to": (datetime.today() + relativedelta(days=1)),
34+
"request_date_from": datetime.today(),
35+
"request_date_to": (datetime.today() + relativedelta(days=1)),
4436
"number_of_days": 1,
4537
"state": "validate",
4638
}
@@ -56,8 +48,8 @@ def setUpClass(cls):
5648
"name": "Test 2",
5749
"employee_id": cls.employee.id,
5850
"holiday_status_id": leave_type.id,
59-
"date_from": (datetime.today() + relativedelta(days=3)),
60-
"date_to": (datetime.today() + relativedelta(days=5)),
51+
"request_date_from": (datetime.today() + relativedelta(days=3)),
52+
"request_date_to": (datetime.today() + relativedelta(days=5)),
6153
"number_of_days": 2,
6254
"state": "validate",
6355
}

hr_holidays_summary_email/views/res_config_settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ref="hr_holidays_settings.res_config_settings_view_form"
1313
/>
1414
<field name="arch" type="xml">
15-
<xpath expr="//div[@data-key='hr_holidays']/div" position="after">
15+
<xpath expr="//app[@name='hr_holidays']/block" position="after">
1616
<div class="row mt16 o_settings_container">
1717
<div
1818
class="col-12 o_setting_box"

hr_holidays_summary_email/views/res_users_views.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
<field name="inherit_id" ref="hr.res_users_view_form_profile" />
99
<field name="arch" type="xml">
1010
<field name="email" position="after">
11-
<field
12-
name="hr_leave_summary_type"
13-
attrs="{'readonly': [('can_edit', '=', False)]}"
14-
/>
11+
<field name="hr_leave_summary_type" readonly="not can_edit" />
1512
</field>
1613
</field>
1714
</record>

0 commit comments

Comments
 (0)