diff options
| author | Dipali Tank <dit@odoo.com> | 2017-08-08 11:53:03 +0200 |
|---|---|---|
| committer | Richard Mathot <rim@odoo.com> | 2017-08-08 11:53:03 +0200 |
| commit | 00f90a70ede123909565e8b20b31e329c15547b5 (patch) | |
| tree | 700b816ffcc3b24b08553129d14ec508bbc49f84 /addons | |
| parent | 4e6d3132ac6a60f6604b6427a8cf4e61cae68ce6 (diff) | |
[IMP] *: holidays -> leaves
The meaning of "holidays" may vary in the UK/US.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/calendar/views/calendar_views.xml | 2 | ||||
| -rw-r--r-- | addons/google_calendar/README.md | 2 | ||||
| -rw-r--r-- | addons/google_calendar/static/description/index.html | 2 | ||||
| -rw-r--r-- | addons/hr/README.md | 2 | ||||
| -rw-r--r-- | addons/hr/views/hr_views.xml | 2 | ||||
| -rw-r--r-- | addons/hr_holidays/__manifest__.py | 2 | ||||
| -rw-r--r-- | addons/hr_holidays/data/report_paperformat.xml | 2 | ||||
| -rw-r--r-- | addons/hr_holidays/security/hr_holidays_security.xml | 10 | ||||
| -rw-r--r-- | addons/l10n_be_hr_payroll/__manifest__.py | 2 | ||||
| -rw-r--r-- | addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml | 2 | ||||
| -rw-r--r-- | addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py | 6 | ||||
| -rw-r--r-- | addons/l10n_in_hr_payroll/__manifest__.py | 2 | ||||
| -rw-r--r-- | addons/product_email_template/data/product_demo.xml | 2 | ||||
| -rw-r--r-- | addons/project_timesheet_holidays/__manifest__.py | 2 | ||||
| -rw-r--r-- | addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml | 2 |
15 files changed, 21 insertions, 21 deletions
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml index 1b57b1461a8..d0857a179f2 100644 --- a/addons/calendar/views/calendar_views.xml +++ b/addons/calendar/views/calendar_views.xml @@ -310,7 +310,7 @@ Click to schedule a new meeting. </p><p> The calendar is shared between employees and fully integrated with - other applications such as the employee holidays or the business + other applications such as the employee leaves or the business opportunities. </p> </field> diff --git a/addons/google_calendar/README.md b/addons/google_calendar/README.md index 770087ab3f2..47b00887fc2 100644 --- a/addons/google_calendar/README.md +++ b/addons/google_calendar/README.md @@ -1,7 +1,7 @@ Google Calendar --------------- -Get your meetings, yours holidays, ... Get your calendar anywhere and never +Get your meetings, your leaves... Get your calendar anywhere and never forget an event, fully synchronized with the Odoo <a href="https://www.odoo.com/page/crm">Open Source CRM</a>. Keep an eye on your events diff --git a/addons/google_calendar/static/description/index.html b/addons/google_calendar/static/description/index.html index b74831077c3..8ff283aa392 100644 --- a/addons/google_calendar/static/description/index.html +++ b/addons/google_calendar/static/description/index.html @@ -1,7 +1,7 @@ <section class="oe_container"> <div class="oe_row oe_spaced"> <h2 class="oe_slogan">Google Calendar</h2> - <h3 class="oe_slogan">Get your meetings, yours holidays, ... Get your calendar anywhere and never forget an event.</h3> + <h3 class="oe_slogan">Get your meetings, your leaves... Get your calendar anywhere and never forget an event.</h3> <div class="oe_span12"> <img src="the_calendar.png" class="oe_picture oe_screenshot"> </div> diff --git a/addons/hr/README.md b/addons/hr/README.md index fb6d4207317..739620ff85a 100644 --- a/addons/hr/README.md +++ b/addons/hr/README.md @@ -49,7 +49,7 @@ Leaves Management ----------------- Keep track of the vacation days accrued by each employee. Employees enter their -requests (paid holidays, sick leave, etc), for managers to approve and +requests (paid leaves, sick leaves, etc), for managers to approve and validate. It's all done in just a few clicks. The agenda of each employee is updated accordingly. diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml index c5392a8f55d..74a26de680c 100644 --- a/addons/hr/views/hr_views.xml +++ b/addons/hr/views/hr_views.xml @@ -584,7 +584,7 @@ </p><p> Odoo's department structure is used to manage all documents related to employees by departments: expenses, timesheets, - leaves and holidays, recruitments, etc. + leaves, recruitments, etc. </p> </field> </record> diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py index e02a7068a89..79a0e47b5e4 100644 --- a/addons/hr_holidays/__manifest__.py +++ b/addons/hr_holidays/__manifest__.py @@ -6,7 +6,7 @@ 'version': '1.5', 'category': 'Human Resources', 'sequence': 27, - 'summary': 'Holidays, Allocation and Leave Requests', + 'summary': 'Leave allocations and leave requests', 'website': 'https://www.odoo.com/page/employees', 'description': """ Manage leave requests and allocations diff --git a/addons/hr_holidays/data/report_paperformat.xml b/addons/hr_holidays/data/report_paperformat.xml index 425e29f9cc6..88c02ae09b2 100644 --- a/addons/hr_holidays/data/report_paperformat.xml +++ b/addons/hr_holidays/data/report_paperformat.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <record id="paperformat_hrsummary" model="report.paperformat"> - <field name="name">Holidays Summary</field> + <field name="name">Leaves Summary</field> <field name="default" eval="True"/> <field name="format">custom</field> <field name="page_height">297</field> diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml index b930939d271..16a2f22c01b 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -18,7 +18,7 @@ </record> <record id="property_rule_holidays_employee" model="ir.rule"> - <field name="name">Employee Holidays</field> + <field name="name">Employee Leaves</field> <field name="model_id" ref="model_hr_holidays"/> <field name="domain_force">[('employee_id.user_id','=',user.id)]</field> <field name="perm_create" eval="False"/> @@ -28,7 +28,7 @@ </record> <record id="property_rule_holidays_employee_write" model="ir.rule"> - <field name="name">Employee Holidays Create, Write, Unlink</field> + <field name="name">Employee Leaves Create, Write, Unlink</field> <field name="model_id" ref="model_hr_holidays"/> <field name="domain_force">[('employee_id.user_id','=',user.id), ('state', 'in', ['draft', 'confirm', 'cancel', 'refuse'])]</field> <field name="perm_read" eval="False"/> @@ -36,21 +36,21 @@ </record> <record id="property_rule_holidays_officer" model="ir.rule"> - <field name="name">Holidays Officer</field> + <field name="name">Leaves Officer</field> <field name="model_id" ref="model_hr_holidays"/> <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('hr_holidays.group_hr_holidays_user'))]"/> </record> <record id="resource_leaves_officer" model="ir.rule"> - <field name="name">Leaves Officer</field> + <field name="name">Leaves Resources Officer</field> <field name="model_id" ref="model_resource_calendar_leaves"/> <field name="domain_force">[(1,'=',1)]</field> <field name="groups" eval="[(4,ref('hr_holidays.group_hr_holidays_user'))]"/> </record> <record id="hr_holidays_status_rule_multi_company" model="ir.rule"> - <field name="name">HR Holiday multi company rule</field> + <field name="name">Leaves multi company rule</field> <field name="model_id" ref="model_hr_holidays_status"/> <field name="global" eval="True"/> <field name="domain_force">['|',('company_id','=',False),('company_id','in',[user.company_id.id])]</field> diff --git a/addons/l10n_be_hr_payroll/__manifest__.py b/addons/l10n_be_hr_payroll/__manifest__.py index 12f4c72db74..92d34e8eb8f 100644 --- a/addons/l10n_be_hr_payroll/__manifest__.py +++ b/addons/l10n_be_hr_payroll/__manifest__.py @@ -16,7 +16,7 @@ Belgian Payroll Rules. * Allow to configure Basic/Gross/Net Salary * Employee Payslip * Monthly Payroll Register - * Integrated with Holiday Management + * Integrated with Leaves Management * Salary Maj, ONSS, Withholding Tax, Child Allowance, ... """, diff --git a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml index bd9dd3e55be..64d73be573f 100644 --- a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml +++ b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml @@ -629,7 +629,7 @@ result = -contract.car_atn <field name="upper_bound">500.0</field> </record> <record id="hr_contract_advantage_template_holidays" model="hr.contract.advantage.template"> - <field name="name">Holidays duration</field> + <field name="name">Leaves duration</field> <field name="code">holidays</field> <field name="default_value">20.0</field> <field name="lower_bound">0.0</field> diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py index 72fbc801345..f365a407a48 100644 --- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py +++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py @@ -19,7 +19,7 @@ class HrContract(models.Model): public_transport_employee_amount = fields.Monetary('Paid by the employee (Monthly)') thirteen_month = fields.Monetary(compute='_compute_holidays_advantages', string='13th Month', help="Yearly gross amount the employee receives as 13th month bonus.") - double_holidays = fields.Monetary(compute='_compute_holidays_advantages', string='Double holidays', + double_holidays = fields.Monetary(compute='_compute_holidays_advantages', string='Double Holidays', help="Yearly gross amount the employee receives as double holidays bonus.") warrant_value_employee = fields.Monetary(compute='_compute_warrants_cost', string="Warrant value for the employee") @@ -62,10 +62,10 @@ class HrContract(models.Model): meal_voucher_amount = fields.Monetary(string="Meal Vouchers", default=lambda self: self.get_attribute('meal_voucher_amount', 'default_value'), help="Amount the employee receives in the form of meal vouchers per worked day.") - holidays = fields.Float(string="Holidays", + holidays = fields.Float(string='Legal Leaves', default=lambda self: self.get_attribute('holidays', 'default_value'), help="Number of days of paid leaves the employee gets per year.") - holidays_editable = fields.Boolean(string="Editable Holidays", default=True) + holidays_editable = fields.Boolean(string="Editable Leaves", default=True) holidays_compensation = fields.Monetary(compute='_compute_holidays_compensation', string="Holidays Compensation") wage_with_holidays = fields.Monetary(compute='_compute_wage_with_holidays', sting="Wage update with holidays retenues") additional_net_amount = fields.Monetary(string="Net Supplements", diff --git a/addons/l10n_in_hr_payroll/__manifest__.py b/addons/l10n_in_hr_payroll/__manifest__.py index c051e0773ec..acaf959339f 100644 --- a/addons/l10n_in_hr_payroll/__manifest__.py +++ b/addons/l10n_in_hr_payroll/__manifest__.py @@ -16,7 +16,7 @@ Indian Payroll Salary Rules. * Allow to configure Basic / Gross / Net Salary * Employee PaySlip * Allowance / Deduction - * Integrated with Holiday Management + * Integrated with Leaves Management * Medical Allowance, Travel Allowance, Child Allowance, ... - Payroll Advice and Report - Yearly Salary by Head and Yearly Salary by Employee Report diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml index 340e2518550..7dff86cc045 100644 --- a/addons/product_email_template/data/product_demo.xml +++ b/addons/product_email_template/data/product_demo.xml @@ -332,7 +332,7 @@ <li>Control the invoicing process</li> <li>Work with purchase requisitions to ask different vendors to submit quotations</li> </ul> - <strong>About Holidays:</strong> + <strong>About Leaves:</strong> <ul> <li>Track the number of vacation days accrued by each employee</li> <li>Allow managers to approve leave requests and plan backups for their teams</li> diff --git a/addons/project_timesheet_holidays/__manifest__.py b/addons/project_timesheet_holidays/__manifest__.py index 600bad8b681..d4374097a22 100644 --- a/addons/project_timesheet_holidays/__manifest__.py +++ b/addons/project_timesheet_holidays/__manifest__.py @@ -7,7 +7,7 @@ 'category': 'Human Resources', 'summary': 'Schedule timesheet when on leaves', 'description': """ -Bridge module to integrate holidays in timesheet +Bridge module to integrate leaves in timesheet ================================================ This module allows to automatically log timesheets when employees are diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml index 7a399265790..f08282c47d0 100644 --- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml +++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml @@ -324,7 +324,7 @@ <div class="text-center col-md-3 mt16 mb16"> <span class="fa fa-2x fa-sun-o"/> <h4 class="mt8 mb0">PTOs</h4> - <p>Vacation, Sick, and Holiday paid leaves</p> + <p>Vacation, Sick, and paid leaves</p> </div> <div class="text-center col-md-3 mt16 mb16"> <span class="fa fa-2x fa-car"/> |
