Skip to content

Commit 9400c55

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #151 into 16.0
Signed-off-by dreispt
2 parents 064d25d + 8da7814 commit 9400c55

File tree

2 files changed

+92
-80
lines changed

2 files changed

+92
-80
lines changed

‎hr_holidays_summary_email/data/mail_template_data.xml

Lines changed: 90 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,53 @@
1212
<div style="margin: 0px; padding: 0px;">
1313
<p>Dear <t t-out="object.name" />,</p>
1414
<br />
15-
<p>This is today's leave summary:</p>
16-
<br />
17-
<table
18-
style="border-spacing: 0; border-collapse: collapse; width: 100%; text-align: center;"
19-
>
20-
<tr>
21-
<th
22-
style="padding: 5px; border: 1px solid black;"
23-
>Employee</th>
24-
<th
25-
style="padding: 5px; border: 1px solid black;"
26-
>Time Off</th>
27-
<th style="padding: 5px; border: 1px solid black;">From</th>
28-
<th style="padding: 5px; border: 1px solid black;">To</th>
29-
</tr>
30-
<t t-set="timeoffs" t-value="ctx.get('time_offs', [])" />
31-
<t t-foreach="timeoffs" t-as="data">
32-
<t
33-
t-set="d_from"
34-
t-value="data.format_hr_leave_summary_date()"
35-
/>
36-
<t
37-
t-set="d_to"
38-
t-value="data.format_hr_leave_summary_date(False)"
39-
/>
15+
<t t-set="timeoffs" t-value="ctx.get('time_offs', [])" />
16+
<t t-if="timeoffs">
17+
<p>This is today's leave summary:</p>
18+
<br />
19+
<table
20+
style="border-spacing: 0; border-collapse: collapse; width: 100%; text-align: center;"
21+
>
4022
<tr>
41-
<td style="padding: 5px; border: 1px solid black;"><t
42-
t-out="data.employee_id.name"
43-
/></td>
44-
<td style="padding: 5px; border: 1px solid black;"><t
45-
t-out="data.name or ''"
46-
/></td>
47-
<td style="padding: 5px; border: 1px solid black;"><t
48-
t-out="d_from"
49-
/></td>
50-
<td style="padding: 5px; border: 1px solid black;"><t
51-
t-out="d_to"
52-
/></td>
23+
<th
24+
style="padding: 5px; border: 1px solid black;"
25+
>Employee</th>
26+
<th
27+
style="padding: 5px; border: 1px solid black;"
28+
>Time Off</th>
29+
<th
30+
style="padding: 5px; border: 1px solid black;"
31+
>From</th>
32+
<th
33+
style="padding: 5px; border: 1px solid black;"
34+
>To</th>
5335
</tr>
54-
</t>
55-
</table>
36+
<t t-foreach="timeoffs" t-as="data">
37+
<t
38+
t-set="d_from"
39+
t-value="data.format_hr_leave_summary_date()"
40+
/>
41+
<t
42+
t-set="d_to"
43+
t-value="data.format_hr_leave_summary_date(False)"
44+
/>
45+
<tr>
46+
<td
47+
style="padding: 5px; border: 1px solid black;"
48+
><t t-out="data.employee_id.name" /></td>
49+
<td
50+
style="padding: 5px; border: 1px solid black;"
51+
><t t-out="data.name or ''" /></td>
52+
<td
53+
style="padding: 5px; border: 1px solid black;"
54+
><t t-out="d_from" /></td>
55+
<td
56+
style="padding: 5px; border: 1px solid black;"
57+
><t t-out="d_to" /></td>
58+
</tr>
59+
</t>
60+
</table></t>
61+
<t t-else=""><p>No leaves for today.</p></t>
5662
</div>
5763
</field>
5864
<field name="lang">{{object.lang}}</field>
@@ -70,47 +76,53 @@
7076
<div style="margin: 0px; padding: 0px;">
7177
<p>Dear <t t-out="object.name" />,</p>
7278
<br />
73-
<p>This is the leaves summary for this week:</p>
74-
<br />
75-
<table
76-
style="border-spacing: 0; border-collapse: collapse; width: 100%; text-align: center;"
77-
>
78-
<tr>
79-
<th
80-
style="padding: 5px; border: 1px solid black;"
81-
>Employee</th>
82-
<th
83-
style="padding: 5px; border: 1px solid black;"
84-
>Time Off</th>
85-
<th style="padding: 5px; border: 1px solid black;">From</th>
86-
<th style="padding: 5px; border: 1px solid black;">To</th>
87-
</tr>
88-
<t t-set="timeoffs" t-value="ctx.get('time_offs', [])" />
89-
<t t-foreach="timeoffs" t-as="data">
90-
<t
91-
t-set="d_from"
92-
t-value="data.format_hr_leave_summary_date()"
93-
/>
94-
<t
95-
t-set="d_to"
96-
t-value="data.format_hr_leave_summary_date(False)"
97-
/>
79+
<t t-set="timeoffs" t-value="ctx.get('time_offs', [])" />
80+
<t t-if="timeoffs">
81+
<p>This is the leaves summary for this week:</p>
82+
<br />
83+
<table
84+
style="border-spacing: 0; border-collapse: collapse; width: 100%; text-align: center;"
85+
>
9886
<tr>
99-
<td style="padding: 5px; border: 1px solid black;"><t
100-
t-out="data.employee_id.name"
101-
/></td>
102-
<td style="padding: 5px; border: 1px solid black;"><t
103-
t-out="data.name or ''"
104-
/></td>
105-
<td style="padding: 5px; border: 1px solid black;"><t
106-
t-out="d_from"
107-
/></td>
108-
<td style="padding: 5px; border: 1px solid black;"><t
109-
t-out="d_to"
110-
/></td>
87+
<th
88+
style="padding: 5px; border: 1px solid black;"
89+
>Employee</th>
90+
<th
91+
style="padding: 5px; border: 1px solid black;"
92+
>Time Off</th>
93+
<th
94+
style="padding: 5px; border: 1px solid black;"
95+
>From</th>
96+
<th
97+
style="padding: 5px; border: 1px solid black;"
98+
>To</th>
11199
</tr>
112-
</t>
113-
</table>
100+
<t t-foreach="timeoffs" t-as="data">
101+
<t
102+
t-set="d_from"
103+
t-value="data.format_hr_leave_summary_date()"
104+
/>
105+
<t
106+
t-set="d_to"
107+
t-value="data.format_hr_leave_summary_date(False)"
108+
/>
109+
<tr>
110+
<td
111+
style="padding: 5px; border: 1px solid black;"
112+
><t t-out="data.employee_id.name" /></td>
113+
<td
114+
style="padding: 5px; border: 1px solid black;"
115+
><t t-out="data.name or ''" /></td>
116+
<td
117+
style="padding: 5px; border: 1px solid black;"
118+
><t t-out="d_from" /></td>
119+
<td
120+
style="padding: 5px; border: 1px solid black;"
121+
><t t-out="d_to" /></td>
122+
</tr>
123+
</t>
124+
</table></t>
125+
<t t-else=""><p>No leaves for this week.</p></t>
114126
</div>
115127
</field>
116128
<field name="lang">{{object.lang}}</field>

‎hr_holidays_summary_email/models/hr_leave.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ def _cron_send_hr_leave_summary_emails_weekly(self, employees_to_notify, company
7171
if str(fields.Date.today().weekday()) != company.hr_holidays_summary_weekly_dow:
7272
return
7373
domain = self._get_hr_leave_summary_weekly_domain(company.id)
74-
today_time_offs = self.env["hr.leave"].sudo().search(domain)
74+
weekly_time_offs = self.env["hr.leave"].sudo().search(domain)
7575
template = self._get_hr_leave_summary_mail_template("weekly")
7676
if not template:
7777
return
7878
for employee in employees_to_notify:
79-
template.with_context(time_offs=today_time_offs).send_mail(
79+
template.with_context(time_offs=weekly_time_offs).send_mail(
8080
employee.id, force_send=False
8181
)
8282
employees_to_notify.write({"last_hr_leave_summary_sent": fields.Date.today()})

0 commit comments

Comments
 (0)