From e6a5fe02b6669f876122257c4d5f544cc7291a39 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Nov 2018 06:11:57 +0200 Subject: [PATCH 01/22] [12.0][ADD] hr_employee_service_contract: calculate service length based on contracts [UPD] Update hr_employee_service_contract.pot --- hr_employee_service_contract/README.rst | 73 +++ hr_employee_service_contract/__init__.py | 3 + hr_employee_service_contract/__manifest__.py | 32 ++ .../i18n/hr_employee_service_contract.pot | 80 ++++ .../models/__init__.py | 3 + .../models/hr_employee.py | 64 +++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../static/description/index.html | 419 ++++++++++++++++++ .../tests/__init__.py | 3 + .../tests/test_hr_employee_service.py | 138 ++++++ .../views/hr_employee.xml | 36 ++ 12 files changed, 853 insertions(+) create mode 100644 hr_employee_service_contract/README.rst create mode 100644 hr_employee_service_contract/__init__.py create mode 100644 hr_employee_service_contract/__manifest__.py create mode 100644 hr_employee_service_contract/i18n/hr_employee_service_contract.pot create mode 100644 hr_employee_service_contract/models/__init__.py create mode 100644 hr_employee_service_contract/models/hr_employee.py create mode 100644 hr_employee_service_contract/readme/CONTRIBUTORS.rst create mode 100644 hr_employee_service_contract/readme/DESCRIPTION.rst create mode 100644 hr_employee_service_contract/static/description/index.html create mode 100644 hr_employee_service_contract/tests/__init__.py create mode 100644 hr_employee_service_contract/tests/test_hr_employee_service.py create mode 100644 hr_employee_service_contract/views/hr_employee.xml diff --git a/hr_employee_service_contract/README.rst b/hr_employee_service_contract/README.rst new file mode 100644 index 00000000000..e1b3d94e355 --- /dev/null +++ b/hr_employee_service_contract/README.rst @@ -0,0 +1,73 @@ +================================== +HR Employee Service from Contracts +================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github + :target: https://github.com/OCA/hr/tree/12.0/hr_employee_service_contract + :alt: OCA/hr +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_employee_service_contract + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/116/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module computes employee service information based on employee's contracts. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Brainbean Apps + +Contributors +~~~~~~~~~~~~ + +* Alexey Pelykh + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/hr `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_employee_service_contract/__init__.py b/hr_employee_service_contract/__init__.py new file mode 100644 index 00000000000..4b76c7b2d5c --- /dev/null +++ b/hr_employee_service_contract/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/hr_employee_service_contract/__manifest__.py b/hr_employee_service_contract/__manifest__.py new file mode 100644 index 00000000000..9811597eb84 --- /dev/null +++ b/hr_employee_service_contract/__manifest__.py @@ -0,0 +1,32 @@ +# Copyright 2018 Brainbean Apps (https://brainbeanapps.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + 'name': 'HR Employee Service from Contracts', + 'version': '12.0.1.0.0', + 'category': 'Human Resources', + 'website': 'https://github.com/OCA/hr', + 'author': + 'Brainbean Apps, ' + 'Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'installable': True, + 'application': False, + 'summary': ( + 'Employee service information & duration based on employee\'s' + ' contracts' + ), + 'depends': [ + 'hr', + 'hr_contract', + 'hr_employee_service', + ], + 'external_dependencies': { + 'python': [ + 'dateutil', + ], + }, + 'data': [ + 'views/hr_employee.xml', + ], +} diff --git a/hr_employee_service_contract/i18n/hr_employee_service_contract.pot b/hr_employee_service_contract/i18n/hr_employee_service_contract.pot new file mode 100644 index 00000000000..5c15d3ec82a --- /dev/null +++ b/hr_employee_service_contract/i18n/hr_employee_service_contract.pot @@ -0,0 +1,80 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_service_contract +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: hr_employee_service_contract +#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension +msgid "month(s)" +msgstr "" + +#. module: hr_employee_service_contract +#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension +msgid "year(s)" +msgstr "" + +#. module: hr_employee_service_contract +#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension +msgid "day(s)" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model,name:hr_employee_service_contract.model_hr_employee +msgid "Employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__first_contract_id +msgid "First Contract" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__first_contract_id +msgid "First contract of the employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__last_contract_id +msgid "Last Contract" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__last_contract_id +msgid "Last contract of the employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension +msgid "Service Information" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_start_date +msgid "Start Date" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_start_date +msgid "Start date is the first day the employee actually works and this date is used for accrual leave allocations calculation" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_termination_date +msgid "Termination Date" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_termination_date +msgid "Termination date is the last day the employee actually works and this date is used for accrual leave allocations calculation" +msgstr "" + diff --git a/hr_employee_service_contract/models/__init__.py b/hr_employee_service_contract/models/__init__.py new file mode 100644 index 00000000000..7456e6897fe --- /dev/null +++ b/hr_employee_service_contract/models/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import hr_employee diff --git a/hr_employee_service_contract/models/hr_employee.py b/hr_employee_service_contract/models/hr_employee.py new file mode 100644 index 00000000000..50d32e32109 --- /dev/null +++ b/hr_employee_service_contract/models/hr_employee.py @@ -0,0 +1,64 @@ +# Copyright 2018 Brainbean Apps (https://brainbeanapps.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, fields, api + + +class HrEmployee(models.Model): + _inherit = 'hr.employee' + + first_contract_id = fields.Many2one( + 'hr.contract', + compute='_compute_first_contract_id', + string='First Contract', + help='First contract of the employee', + ) + last_contract_id = fields.Many2one( + 'hr.contract', + compute='_compute_last_contract_id', + string='Last Contract', + help='Last contract of the employee', + ) + service_start_date = fields.Date( + string='Start Date', + readonly=True, + related='first_contract_id.date_start', + ) + service_termination_date = fields.Date( + string='Termination Date', + readonly=True, + related='last_contract_id.date_end', + ) + + @api.multi + @api.depends('contract_ids') + def _compute_first_contract_id(self): + Contract = self.env['hr.contract'] + for employee in self: + employee.first_contract_id = Contract.search([ + ('employee_id', '=', employee.id), + ('state', 'not in', self._service_contract_states()), + ], order='date_start asc', limit=1) + + @api.multi + @api.depends('contract_ids') + def _compute_last_contract_id(self): + Contract = self.env['hr.contract'] + for employee in self: + employee.last_contract_id = Contract.search([ + ('employee_id', '=', employee.id), + ('state', 'not in', self._service_contract_states()), + ], order='date_end desc', limit=1) + + @api.multi + @api.onchange('service_hire_date') + def _onchange_service_hire_date(self): # pragma: no cover + # Do nothing + pass + + @api.model + def _service_contract_states(self): + return [ + 'draft', + 'cancel', + ] diff --git a/hr_employee_service_contract/readme/CONTRIBUTORS.rst b/hr_employee_service_contract/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..1c6a35a1e35 --- /dev/null +++ b/hr_employee_service_contract/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Alexey Pelykh diff --git a/hr_employee_service_contract/readme/DESCRIPTION.rst b/hr_employee_service_contract/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..601a44b5f78 --- /dev/null +++ b/hr_employee_service_contract/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module computes employee service information based on employee's contracts. diff --git a/hr_employee_service_contract/static/description/index.html b/hr_employee_service_contract/static/description/index.html new file mode 100644 index 00000000000..a941bfa2dec --- /dev/null +++ b/hr_employee_service_contract/static/description/index.html @@ -0,0 +1,419 @@ + + + + + + +HR Employee Service from Contracts + + + +
+

HR Employee Service from Contracts

+ + +

Beta License: AGPL-3 OCA/hr Translate me on Weblate Try me on Runbot

+

This module computes employee service information based on employee’s contracts.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Brainbean Apps
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/hr project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/hr_employee_service_contract/tests/__init__.py b/hr_employee_service_contract/tests/__init__.py new file mode 100644 index 00000000000..45f44105d5e --- /dev/null +++ b/hr_employee_service_contract/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import test_hr_employee_service diff --git a/hr_employee_service_contract/tests/test_hr_employee_service.py b/hr_employee_service_contract/tests/test_hr_employee_service.py new file mode 100644 index 00000000000..6c36e432909 --- /dev/null +++ b/hr_employee_service_contract/tests/test_hr_employee_service.py @@ -0,0 +1,138 @@ +# Copyright 2018 Brainbean Apps (https://brainbeanapps.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields +from odoo.tests import common + +from dateutil.relativedelta import relativedelta + + +class TestHrEmployeeService(common.TransactionCase): + + def setUp(self): + super().setUp() + + self.today = fields.Date.today() + self.now = fields.Datetime.now() + self.Employee = self.env['hr.employee'] + self.SudoEmployee = self.Employee.sudo() + self.Contract = self.env['hr.contract'] + self.SudoContract = self.Contract.sudo() + + def test_1(self): + employee = self.SudoEmployee.create({ + 'name': 'Employee #1', + 'contract_ids': [ + (0, 0, { + 'name': 'Employee #1 Contract #1', + 'wage': 5000.0, + 'state': 'close', + 'date_start': self.today - relativedelta(years=3), + 'date_end': self.today - relativedelta(years=1), + }), + ], + }) + + self.assertEqual( + employee.service_start_date, + self.today - relativedelta(years=3) + ) + self.assertEqual( + employee.service_termination_date, + self.today - relativedelta(years=1) + ) + + def test_2(self): + employee = self.SudoEmployee.create({ + 'name': 'Employee #2', + 'contract_ids': [ + (0, 0, { + 'name': 'Employee #2 Contract #1', + 'wage': 5000.0, + 'state': 'open', + 'date_start': self.today - relativedelta(years=3), + }), + ], + }) + + self.assertEqual( + employee.service_start_date, + self.today - relativedelta(years=3) + ) + self.assertEqual( + employee.service_termination_date, + False + ) + + def test_3(self): + employee = self.SudoEmployee.create({ + 'name': 'Employee #3', + 'contract_ids': [ + (0, 0, { + 'name': 'Employee #3 Contract #1', + 'wage': 5000.0, + 'state': 'close', + 'date_start': self.today - relativedelta(years=5), + 'date_end': self.today - relativedelta(years=1), + }), + (0, 0, { + 'name': 'Employee #3 Contract #2', + 'wage': 5000.0, + 'state': 'open', + 'date_start': self.today - relativedelta(years=3), + }), + ], + }) + + self.assertEqual( + employee.service_start_date, + self.today - relativedelta(years=5) + ) + self.assertEqual( + employee.service_termination_date, + False + ) + + def test_4(self): + employee = self.SudoEmployee.create({ + 'name': 'Employee #4', + 'contract_ids': [ + (0, 0, { + 'name': 'Employee #4 Contract #1', + 'wage': 5000.0, + 'state': 'close', + 'date_start': self.today - relativedelta(years=5), + 'date_end': self.today - relativedelta(years=1), + }), + (0, 0, { + 'name': 'Employee #4 Contract #2', + 'wage': 5000.0, + 'state': 'close', + 'date_start': self.today - relativedelta(years=3), + 'date_end': self.today - relativedelta(years=2), + }), + ], + }) + + self.assertEqual( + employee.service_start_date, + self.today - relativedelta(years=5) + ) + self.assertEqual( + employee.service_termination_date, + self.today - relativedelta(years=1) + ) + + def test_5(self): + employee = self.SudoEmployee.create({ + 'name': 'Employee #5', + }) + + self.assertEqual( + employee.service_start_date, + False + ) + self.assertEqual( + employee.service_termination_date, + False + ) diff --git a/hr_employee_service_contract/views/hr_employee.xml b/hr_employee_service_contract/views/hr_employee.xml new file mode 100644 index 00000000000..3407d9b7dd2 --- /dev/null +++ b/hr_employee_service_contract/views/hr_employee.xml @@ -0,0 +1,36 @@ + + + + + + view.employee.form.inherit.extension + hr.employee + + + + + + + + + + + + + + + From 21724d61fa1027125464cf0fe9966b8872fe4b32 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Tue, 25 Dec 2018 13:38:27 +0200 Subject: [PATCH 02/22] [FIX] hr_employee_service_contract: remove duplicate view [UPD] Update hr_employee_service_contract.pot [ADD] icon.png --- hr_employee_service_contract/__manifest__.py | 3 -- .../i18n/hr_employee_service_contract.pot | 20 ---------- .../models/hr_employee.py | 34 +++++++++++------ .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/hr_employee.xml | 36 ------------------ 5 files changed, 23 insertions(+), 70 deletions(-) create mode 100644 hr_employee_service_contract/static/description/icon.png delete mode 100644 hr_employee_service_contract/views/hr_employee.xml diff --git a/hr_employee_service_contract/__manifest__.py b/hr_employee_service_contract/__manifest__.py index 9811597eb84..80c7c0e5689 100644 --- a/hr_employee_service_contract/__manifest__.py +++ b/hr_employee_service_contract/__manifest__.py @@ -26,7 +26,4 @@ 'dateutil', ], }, - 'data': [ - 'views/hr_employee.xml', - ], } diff --git a/hr_employee_service_contract/i18n/hr_employee_service_contract.pot b/hr_employee_service_contract/i18n/hr_employee_service_contract.pot index 5c15d3ec82a..6e795e9a795 100644 --- a/hr_employee_service_contract/i18n/hr_employee_service_contract.pot +++ b/hr_employee_service_contract/i18n/hr_employee_service_contract.pot @@ -13,21 +13,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: hr_employee_service_contract -#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension -msgid "month(s)" -msgstr "" - -#. module: hr_employee_service_contract -#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension -msgid "year(s)" -msgstr "" - -#. module: hr_employee_service_contract -#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension -msgid "day(s)" -msgstr "" - #. module: hr_employee_service_contract #: model:ir.model,name:hr_employee_service_contract.model_hr_employee msgid "Employee" @@ -53,11 +38,6 @@ msgstr "" msgid "Last contract of the employee" msgstr "" -#. module: hr_employee_service_contract -#: model_terms:ir.ui.view,arch_db:hr_employee_service_contract.view_employee_form_inherit_extension -msgid "Service Information" -msgstr "" - #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_start_date msgid "Start Date" diff --git a/hr_employee_service_contract/models/hr_employee.py b/hr_employee_service_contract/models/hr_employee.py index 50d32e32109..466b21aa147 100644 --- a/hr_employee_service_contract/models/hr_employee.py +++ b/hr_employee_service_contract/models/hr_employee.py @@ -35,20 +35,22 @@ class HrEmployee(models.Model): def _compute_first_contract_id(self): Contract = self.env['hr.contract'] for employee in self: - employee.first_contract_id = Contract.search([ - ('employee_id', '=', employee.id), - ('state', 'not in', self._service_contract_states()), - ], order='date_start asc', limit=1) + employee.first_contract_id = Contract.search( + employee._get_contract_filter(), + order='date_start asc', + limit=1 + ) @api.multi @api.depends('contract_ids') def _compute_last_contract_id(self): Contract = self.env['hr.contract'] for employee in self: - employee.last_contract_id = Contract.search([ - ('employee_id', '=', employee.id), - ('state', 'not in', self._service_contract_states()), - ], order='date_end desc', limit=1) + employee.last_contract_id = Contract.search( + employee._get_contract_filter(), + order='date_end desc', + limit=1 + ) @api.multi @api.onchange('service_hire_date') @@ -56,9 +58,19 @@ def _onchange_service_hire_date(self): # pragma: no cover # Do nothing pass + @api.multi + def _get_contract_filter(self): + self.ensure_one() + + return [ + ('employee_id', '=', self.id), + ('state', 'in', self._get_service_contract_states()), + ] + @api.model - def _service_contract_states(self): + def _get_service_contract_states(self): return [ - 'draft', - 'cancel', + 'open', + 'pending', + 'close', ] diff --git a/hr_employee_service_contract/static/description/icon.png b/hr_employee_service_contract/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/hr_employee_service_contract/views/hr_employee.xml b/hr_employee_service_contract/views/hr_employee.xml deleted file mode 100644 index 3407d9b7dd2..00000000000 --- a/hr_employee_service_contract/views/hr_employee.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - view.employee.form.inherit.extension - hr.employee - - - - - - - - - - - - - - - From 3eb8ff2658aaa2f142a97e9132831c56209ab566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Allard?= Date: Thu, 23 May 2019 19:20:21 +0000 Subject: [PATCH 03/22] Added translation using Weblate (French) --- hr_employee_service_contract/i18n/fr.po | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 hr_employee_service_contract/i18n/fr.po diff --git a/hr_employee_service_contract/i18n/fr.po b/hr_employee_service_contract/i18n/fr.po new file mode 100644 index 00000000000..bf12751e38d --- /dev/null +++ b/hr_employee_service_contract/i18n/fr.po @@ -0,0 +1,60 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_service_contract +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: hr_employee_service_contract +#: model:ir.model,name:hr_employee_service_contract.model_hr_employee +msgid "Employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__first_contract_id +msgid "First Contract" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__first_contract_id +msgid "First contract of the employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__last_contract_id +msgid "Last Contract" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__last_contract_id +msgid "Last contract of the employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_start_date +msgid "Start Date" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_start_date +msgid "Start date is the first day the employee actually works and this date is used for accrual leave allocations calculation" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_termination_date +msgid "Termination Date" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_termination_date +msgid "Termination date is the last day the employee actually works and this date is used for accrual leave allocations calculation" +msgstr "" From 375b0727e32a7694adbe412955a38f176830fce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Allard?= Date: Thu, 23 May 2019 19:20:33 +0000 Subject: [PATCH 04/22] Translated using Weblate (French) Currently translated at 88.9% (8 of 9 strings) Translation: hr-12.0/hr-12.0-hr_employee_service_contract Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_employee_service_contract/fr/ --- hr_employee_service_contract/i18n/fr.po | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hr_employee_service_contract/i18n/fr.po b/hr_employee_service_contract/i18n/fr.po index bf12751e38d..c2c28eacb7b 100644 --- a/hr_employee_service_contract/i18n/fr.po +++ b/hr_employee_service_contract/i18n/fr.po @@ -6,55 +6,63 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2019-05-23 20:19+0000\n" +"Last-Translator: Kévin Allard \n" "Language-Team: none\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.6.1\n" #. module: hr_employee_service_contract #: model:ir.model,name:hr_employee_service_contract.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Employé(e)" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__first_contract_id msgid "First Contract" -msgstr "" +msgstr "Premier contrat" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__first_contract_id msgid "First contract of the employee" -msgstr "" +msgstr "Premier contrat de l'employé(e)" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__last_contract_id msgid "Last Contract" -msgstr "" +msgstr "Dernier contrat" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__last_contract_id msgid "Last contract of the employee" -msgstr "" +msgstr "Dernier contrat de l'employé(e)" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_start_date msgid "Start Date" -msgstr "" +msgstr "Date de début" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_start_date msgid "Start date is the first day the employee actually works and this date is used for accrual leave allocations calculation" msgstr "" +"La date de début est le premier jour où l'employé travaille réellement et " +"cette date est utilisée pour le calcul des allocations de congés selon " +"l'exercice comptable" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_termination_date msgid "Termination Date" -msgstr "" +msgstr "Date de fin" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_termination_date +#, fuzzy msgid "Termination date is the last day the employee actually works and this date is used for accrual leave allocations calculation" msgstr "" +"La date de fin est le dernier jour où l'employé travaille réellement et " +"cette date est utilisée pour le calcul des allocations de congés accumulés" From ceb3906ca042621b481c74c190f2ee58fa89d8b3 Mon Sep 17 00:00:00 2001 From: Jaime Arroyo Date: Wed, 19 Jun 2019 12:16:16 +0200 Subject: [PATCH 05/22] [12.0][ADD] Migration script from hr_employee_seniority --- .../migrations/12.0.1.0.0/pre-migration.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 hr_employee_service_contract/migrations/12.0.1.0.0/pre-migration.py diff --git a/hr_employee_service_contract/migrations/12.0.1.0.0/pre-migration.py b/hr_employee_service_contract/migrations/12.0.1.0.0/pre-migration.py new file mode 100644 index 00000000000..2f8491f913b --- /dev/null +++ b/hr_employee_service_contract/migrations/12.0.1.0.0/pre-migration.py @@ -0,0 +1,17 @@ +# Copyright 2019 Eficent +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from openupgradelib import openupgrade + + +@openupgrade.migrate() +def migrate(env, version): + cr = env.cr + if openupgrade.column_exists(cr, 'hr_employee', 'initial_employment_date'): + openupgrade.logged_query( + cr, """ + UPDATE hr_employee + SET service_hire_date = initial_employment_date; + WHERE initial_employment_date IS NOT NULL; + """ + ) From ce1663987f9f1b42d77269b51c884848526e61f5 Mon Sep 17 00:00:00 2001 From: Jaime Arroyo Date: Wed, 26 Jun 2019 16:18:14 +0000 Subject: [PATCH 06/22] Added translation using Weblate (Spanish) --- hr_employee_service_contract/i18n/es.po | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 hr_employee_service_contract/i18n/es.po diff --git a/hr_employee_service_contract/i18n/es.po b/hr_employee_service_contract/i18n/es.po new file mode 100644 index 00000000000..0e3dc333228 --- /dev/null +++ b/hr_employee_service_contract/i18n/es.po @@ -0,0 +1,60 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_employee_service_contract +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: hr_employee_service_contract +#: model:ir.model,name:hr_employee_service_contract.model_hr_employee +msgid "Employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__first_contract_id +msgid "First Contract" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__first_contract_id +msgid "First contract of the employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__last_contract_id +msgid "Last Contract" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__last_contract_id +msgid "Last contract of the employee" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_start_date +msgid "Start Date" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_start_date +msgid "Start date is the first day the employee actually works and this date is used for accrual leave allocations calculation" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_termination_date +msgid "Termination Date" +msgstr "" + +#. module: hr_employee_service_contract +#: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_termination_date +msgid "Termination date is the last day the employee actually works and this date is used for accrual leave allocations calculation" +msgstr "" From 9d11cb1b07bdb328d9a2173e2673352c2e4b1a26 Mon Sep 17 00:00:00 2001 From: Jaime Arroyo Date: Wed, 26 Jun 2019 16:18:25 +0000 Subject: [PATCH 07/22] Translated using Weblate (Spanish) Currently translated at 100.0% (9 of 9 strings) Translation: hr-12.0/hr-12.0-hr_employee_service_contract Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_employee_service_contract/es/ [UPD] README.rst --- hr_employee_service_contract/i18n/es.po | 23 ++++++++++++------- .../static/description/index.html | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/hr_employee_service_contract/i18n/es.po b/hr_employee_service_contract/i18n/es.po index 0e3dc333228..b10aec187a4 100644 --- a/hr_employee_service_contract/i18n/es.po +++ b/hr_employee_service_contract/i18n/es.po @@ -6,55 +6,62 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2019-06-26 18:42+0000\n" +"Last-Translator: Jaime Arroyo \n" "Language-Team: none\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.6.1\n" #. module: hr_employee_service_contract #: model:ir.model,name:hr_employee_service_contract.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Empleado" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__first_contract_id msgid "First Contract" -msgstr "" +msgstr "Primer Contrato" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__first_contract_id msgid "First contract of the employee" -msgstr "" +msgstr "Primer Contrato del Empleado" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__last_contract_id msgid "Last Contract" -msgstr "" +msgstr "Último Contrato" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__last_contract_id msgid "Last contract of the employee" -msgstr "" +msgstr "Último Contrato del Empleado" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_start_date msgid "Start Date" -msgstr "" +msgstr "Fecha de Inicio" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_start_date msgid "Start date is the first day the employee actually works and this date is used for accrual leave allocations calculation" msgstr "" +"La fecha de inicio es el primer día que el empleado realmente trabaja y esta " +"fecha se utiliza para el cálculo de las asignaciones de vacaciones devengadas" #. module: hr_employee_service_contract #: model:ir.model.fields,field_description:hr_employee_service_contract.field_hr_employee__service_termination_date msgid "Termination Date" -msgstr "" +msgstr "Fecha de finalización" #. module: hr_employee_service_contract #: model:ir.model.fields,help:hr_employee_service_contract.field_hr_employee__service_termination_date msgid "Termination date is the last day the employee actually works and this date is used for accrual leave allocations calculation" msgstr "" +"La fecha de finalización es el último día que el empleado realmente trabaja " +"y esta fecha se utiliza para el cálculo de las asignaciones de vacaciones " +"devengadas" diff --git a/hr_employee_service_contract/static/description/index.html b/hr_employee_service_contract/static/description/index.html index a941bfa2dec..4a3ca25493b 100644 --- a/hr_employee_service_contract/static/description/index.html +++ b/hr_employee_service_contract/static/description/index.html @@ -3,7 +3,7 @@ - + HR Employee Service from Contracts