From cdfa7eccb26efea1b8cb4c5f5c387122d13cdb88 Mon Sep 17 00:00:00 2001
From: Alexander Bigga
Date: Tue, 23 Sep 2025 19:34:16 +0200
Subject: [PATCH 1/2] hr_holidays_webform: add option to set default manager
email
---
.prettierrc.yml | 7 +++++--
hr_holidays_webform/data/leave_report_mail_template.xml | 2 +-
.../data/leave_requests_mail_template.xml | 2 +-
hr_holidays_webform/models/res_config_settings.py | 5 +++++
hr_holidays_webform/views/res_config_settings.xml | 9 +++++++++
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.prettierrc.yml b/.prettierrc.yml
index f447369..9ce4c5b 100644
--- a/.prettierrc.yml
+++ b/.prettierrc.yml
@@ -9,9 +9,12 @@ xmlWhitespaceSensitivity: "ignore"
tabWidth: 4
overrides:
- - files: "hr_holidays_webform/views/report.xml"
+ - files:
+ - "hr_holidays_webform/views/report.xml"
+ - "hr_holidays_webform/data/leave_report_mail_template.xml"
+ - "hr_holidays_webform/data/leave_requests_mail_template.xml"
options:
- printWidth: 120
+ printWidth: 240
- files: "*.(yaml|yml)"
options:
tabWidth: 2
diff --git a/hr_holidays_webform/data/leave_report_mail_template.xml b/hr_holidays_webform/data/leave_report_mail_template.xml
index 2ebe02b..50ca80d 100644
--- a/hr_holidays_webform/data/leave_report_mail_template.xml
+++ b/hr_holidays_webform/data/leave_report_mail_template.xml
@@ -3,7 +3,7 @@
Leave Monthly Report
Monthly Leave Report
- manager@example.com
+ {{ object.employee_id.leave_manager_id.partner_id.email or object.env['ir.config_parameter'].sudo().get_param('hr_leave_request.manager_email', 'manager@example.com') }}
Hello,
diff --git a/hr_holidays_webform/data/leave_requests_mail_template.xml b/hr_holidays_webform/data/leave_requests_mail_template.xml
index 498a2c4..817c90a 100644
--- a/hr_holidays_webform/data/leave_requests_mail_template.xml
+++ b/hr_holidays_webform/data/leave_requests_mail_template.xml
@@ -3,7 +3,7 @@
Leave Request Notification
New {{ object.name }}
- manager@example.com
+ {{ object.employee_id.leave_manager_id.partner_id.email or object.env['ir.config_parameter'].sudo().get_param('hr_leave_request.manager_email', 'manager@example.com') }}
Hello,
diff --git a/hr_holidays_webform/models/res_config_settings.py b/hr_holidays_webform/models/res_config_settings.py
index faaf22e..7620278 100644
--- a/hr_holidays_webform/models/res_config_settings.py
+++ b/hr_holidays_webform/models/res_config_settings.py
@@ -9,3 +9,8 @@ class ResConfigSettings(models.TransientModel):
string="Default Leave Type for Leave Requests",
config_parameter="hr_leave_request.default_leave_type",
)
+
+ manager_email = fields.Char(
+ string="Default Manager Email",
+ config_parameter="hr_leave_request.manager_email",
+ )
diff --git a/hr_holidays_webform/views/res_config_settings.xml b/hr_holidays_webform/views/res_config_settings.xml
index aa04ec1..ebe3137 100644
--- a/hr_holidays_webform/views/res_config_settings.xml
+++ b/hr_holidays_webform/views/res_config_settings.xml
@@ -27,6 +27,15 @@
+
+
+
+
+
+ Default email address for leave request notifications
+
+
+
From 470034a858a63070e5f9a6adfdb303b833c3db24 Mon Sep 17 00:00:00 2001
From: Alexander Bigga
Date: Tue, 23 Sep 2025 20:05:56 +0200
Subject: [PATCH 2/2] Try to fix automatic tests with odoo
---
hr_holidays_webform/data/leave_requests_mail_template.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hr_holidays_webform/data/leave_requests_mail_template.xml b/hr_holidays_webform/data/leave_requests_mail_template.xml
index 817c90a..3c4e327 100644
--- a/hr_holidays_webform/data/leave_requests_mail_template.xml
+++ b/hr_holidays_webform/data/leave_requests_mail_template.xml
@@ -3,7 +3,7 @@
Leave Request Notification
New {{ object.name }}
- {{ object.employee_id.leave_manager_id.partner_id.email or object.env['ir.config_parameter'].sudo().get_param('hr_leave_request.manager_email', 'manager@example.com') }}
+ {{ object.env['ir.config_parameter'].sudo().get_param('hr_leave_request.manager_email', 'manager@example.com') }}
Hello,