summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwapnesh Shah <swapneshshah111@gmail.com>2020-05-17 18:15:51 +0000
committerYannick Tivisse <yti@odoo.com>2020-05-18 08:17:31 +0000
commit57f2dc20a17ef9e08e118a60271e55e7e74170c7 (patch)
treede90a022eae6f14b975b90d6875d07fd2b89e6f1
parent1c7c837a10c25fe1a7377df0d6268b485e52482c (diff)
[IMP] hr*: correct term on warning
Followup on a3daff6 Use `time off` word instead of 'leave'.
-rw-r--r--addons/hr/views/hr_department_views.xml2
-rw-r--r--addons/hr_holidays/models/hr_leave.py8
-rw-r--r--addons/hr_holidays/views/hr_leave_allocation_views.xml2
-rw-r--r--addons/hr_holidays/views/hr_views.xml2
-rw-r--r--addons/hr_presence/data/mail_data.xml2
-rw-r--r--addons/hr_presence/data/sms_data.xml2
-rw-r--r--addons/hr_presence/models/hr_employee.py2
7 files changed, 10 insertions, 10 deletions
diff --git a/addons/hr/views/hr_department_views.xml b/addons/hr/views/hr_department_views.xml
index f80c7ca5696..906e9a6956b 100644
--- a/addons/hr/views/hr_department_views.xml
+++ b/addons/hr/views/hr_department_views.xml
@@ -127,7 +127,7 @@
</p><p>
Odoo's department structure is used to manage all documents
related to employees by departments: expenses, timesheets,
- leaves, recruitments, etc.
+ time off, recruitments, etc.
</p>
</field>
</record>
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index d8e20b808a7..4af264c8d0f 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -679,10 +679,10 @@ class HolidaysRequest(models.Model):
if state == 'validate1':
employees = employees.filtered(lambda employee: employee.leave_manager_id != self.env.user)
if employees and not is_leave_user:
- raise AccessError(_('You cannot first approve a leave for %s, because you are not his leave manager' % (employees[0].name,)))
+ raise AccessError(_('You cannot first approve a time off for %s, because you are not his time off manager' % (employees[0].name,)))
elif state == 'validate' and not is_leave_user:
# Is probably handled via ir.rule
- raise AccessError(_('You don\'t have the rights to apply second approval on a leave request'))
+ raise AccessError(_('You don\'t have the rights to apply second approval on a time off request'))
@api.model
def create(self, values):
@@ -767,7 +767,7 @@ class HolidaysRequest(models.Model):
default['request_date_from'] = default.get('date_from')
default['request_date_to'] = default.get('date_to')
return super().copy_data(default)
- raise UserError(_('A leave cannot be duplicated.'))
+ raise UserError(_('A time off cannot be duplicated.'))
def _get_mail_redirect_suggested_company(self):
return self.holiday_status_id.company_id
@@ -936,7 +936,7 @@ class HolidaysRequest(models.Model):
if conflicting_leaves:
# YTI: More complex use cases could be managed in master
if holiday.leave_type_request_unit != 'day' or any(l.leave_type_request_unit == 'hour' for l in conflicting_leaves):
- raise ValidationError(_('You can not have 2 leaves that overlaps on the same day.'))
+ raise ValidationError(_('You can not have 2 time off that overlaps on the same day.'))
for conflicting_leave in conflicting_leaves:
if conflicting_leave.leave_type_request_unit == 'half_day' and conflicting_leave.request_unit_half:
diff --git a/addons/hr_holidays/views/hr_leave_allocation_views.xml b/addons/hr_holidays/views/hr_leave_allocation_views.xml
index 9ee2b0eb6d1..b8b9be1c61e 100644
--- a/addons/hr_holidays/views/hr_leave_allocation_views.xml
+++ b/addons/hr_holidays/views/hr_leave_allocation_views.xml
@@ -68,7 +68,7 @@
attrs="{'invisible': [('holiday_type', '!=', 'employee')]}"
name="%(hr_leave_action_all)d"
context="{'search_default_employee_id': [employee_id], 'search_default_holiday_status_id': [holiday_status_id], 'default_holiday_status_id': holiday_status_id}"
- help="Leaves Taken/Total Allocated">
+ help="Time off Taken/Total Allocated">
<div class="o_stat_info">
<span class="o_stat_value">
<field name="leaves_taken" digits="[42,1]"/>/<field name="max_leaves" digits="[42,1]"/>
diff --git a/addons/hr_holidays/views/hr_views.xml b/addons/hr_holidays/views/hr_views.xml
index a5936b0759f..f323bfdaf11 100644
--- a/addons/hr_holidays/views/hr_views.xml
+++ b/addons/hr_holidays/views/hr_views.xml
@@ -55,7 +55,7 @@
<div class="col-12 o_kanban_primary_bottom bottom_block">
<div class="row">
<div class="col-3">
- <a name="%(hr_employee_action_from_department)d" type="action" title="Absent Employee(s), Whose leaves request are either confirmed or validated on today">Absence</a>
+ <a name="%(hr_employee_action_from_department)d" type="action" title="Absent Employee(s), Whose time off request are either confirmed or validated on today">Absence</a>
</div>
<div class="col-9">
<field name="absence_of_today" widget="progressbar" options="{'current_value': 'absence_of_today', 'max_value': 'total_employee', 'editable': false}"/>
diff --git a/addons/hr_presence/data/mail_data.xml b/addons/hr_presence/data/mail_data.xml
index 1742f64a376..08a5731e58d 100644
--- a/addons/hr_presence/data/mail_data.xml
+++ b/addons/hr_presence/data/mail_data.xml
@@ -11,7 +11,7 @@
<field name="body_html" type="xml">
<div>
Dear ${object.name},<br/><br/>
- Exception made if there was a mistake of ours, it seems that you are not at your office and there is not request of leaves from you.<br/>
+ Exception made if there was a mistake of ours, it seems that you are not at your office and there is not request of time off from you.<br/>
Please, take appropriate measures in order to carry out this work absence.<br/>
Do not hesitate to contact your manager or the human resource department.
<br/>Best Regards,<br/><br/>
diff --git a/addons/hr_presence/data/sms_data.xml b/addons/hr_presence/data/sms_data.xml
index 8a334c772cc..5f51ba956d2 100644
--- a/addons/hr_presence/data/sms_data.xml
+++ b/addons/hr_presence/data/sms_data.xml
@@ -4,7 +4,7 @@
<record id="sms_template_data_hr_presence" model="sms.template">
<field name="name">Employee: Presence Reminder</field>
<field name="model_id" ref="hr.model_hr_employee"/>
- <field name="body">Exception made if there was a mistake of ours, it seems that you are not at your office and there is not request of leaves from you.
+ <field name="body">Exception made if there was a mistake of ours, it seems that you are not at your office and there is not request of time off from you.
Please, take appropriate measures in order to carry out this work absence.
Do not hesitate to contact your manager or the human resource department.</field>
</record>
diff --git a/addons/hr_presence/models/hr_employee.py b/addons/hr_presence/models/hr_employee.py
index 03111b39e21..c3556229e19 100644
--- a/addons/hr_presence/models/hr_employee.py
+++ b/addons/hr_presence/models/hr_employee.py
@@ -142,7 +142,7 @@ class Employee(models.AbstractModel):
template = self.env.ref('hr_presence.sms_template_presence', False)
if not template:
- context['default_body'] = _("""Exception made if there was a mistake of ours, it seems that you are not at your office and there is not request of leaves from you.
+ context['default_body'] = _("""Exception made if there was a mistake of ours, it seems that you are not at your office and there is not request of time off from you.
Please, take appropriate measures in order to carry out this work absence.
Do not hesitate to contact your manager or the human resource department.""")
else: