From d06cdea309eb8a61c7731fc2c35a865fc1a1c034 Mon Sep 17 00:00:00 2001 From: Denis Leemann Date: Wed, 22 Feb 2017 15:26:21 +0100 Subject: [PATCH] [MIG] hr_contract_reference: Migrated to 10.0 --- hr_contract_reference/README.rst | 13 +++++++-- hr_contract_reference/__init__.py | 23 ++------------- hr_contract_reference/__manifest__.py | 27 ++++------------- .../data/hr_contract_sequence.xml | 8 ++--- hr_contract_reference/models/__init__.py | 23 ++------------- hr_contract_reference/models/hr_contract.py | 29 ++++--------------- .../views/hr_contract_view.xml | 27 ++++++++--------- 7 files changed, 42 insertions(+), 108 deletions(-) diff --git a/hr_contract_reference/README.rst b/hr_contract_reference/README.rst index 81094bb23db..41591d0faf0 100644 --- a/hr_contract_reference/README.rst +++ b/hr_contract_reference/README.rst @@ -1,5 +1,6 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License: AGPL-3 + :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 HR Contract Reference ===================== @@ -13,7 +14,7 @@ Installation To install this module, you need to: -* clone the branch 8.0 of the repository https://github.com/OCA/hr +* clone the branch 10.0 of the repository https://github.com/OCA/hr * add the path to this repository in your configuration (addons-path) * update the module list * search for "HR Contract Reference" in your addons @@ -33,6 +34,13 @@ Usage When you will create a new employee contract, the field reference will be assigned automatically with the next number of the predefined sequence. +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. + Credits ======= @@ -41,6 +49,7 @@ Contributors * Michael Telahun Makonnen * Fekete Mihai +* Denis Leemann Maintainer ---------- diff --git a/hr_contract_reference/__init__.py b/hr_contract_reference/__init__.py index eac8ce4bbd6..9f9383fe71b 100644 --- a/hr_contract_reference/__init__.py +++ b/hr_contract_reference/__init__.py @@ -1,22 +1,5 @@ -# -*- coding:utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# All Rights Reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# copyright 2011,2013 Michael Telahun Makonnen +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/hr_contract_reference/__manifest__.py b/hr_contract_reference/__manifest__.py index d66913a4aa7..9ce1a7b6867 100644 --- a/hr_contract_reference/__manifest__.py +++ b/hr_contract_reference/__manifest__.py @@ -1,26 +1,9 @@ -# -*- coding:utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# All Rights Reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# copyright 2011,2013 Michael Telahun Makonnen +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "HR Contract Reference", - "version": "8.0.1.0.0", + "version": "10.0.1.0.0", "category": "Generic Modules/Human Resources", "author": 'Michael Telahun Makonnen, ' 'Fekete Mihai (Forest and Biomass Services Romania), ' @@ -32,5 +15,5 @@ 'views/hr_contract_view.xml', 'data/hr_contract_sequence.xml', ], - 'installable': False, + 'installable': True, } diff --git a/hr_contract_reference/data/hr_contract_sequence.xml b/hr_contract_reference/data/hr_contract_sequence.xml index 75d2a6b7d7c..304da0a100b 100644 --- a/hr_contract_reference/data/hr_contract_sequence.xml +++ b/hr_contract_reference/data/hr_contract_sequence.xml @@ -1,10 +1,6 @@ - + - - Contract Reference - contract.ref - Contract Reference contract.ref @@ -12,4 +8,4 @@ 5 - \ No newline at end of file + diff --git a/hr_contract_reference/models/__init__.py b/hr_contract_reference/models/__init__.py index d6b47d95e89..00e055f6d2b 100644 --- a/hr_contract_reference/models/__init__.py +++ b/hr_contract_reference/models/__init__.py @@ -1,22 +1,5 @@ -# -*- coding:utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# All Rights Reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# copyright 2011,2013 Michael Telahun Makonnen +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import hr_contract diff --git a/hr_contract_reference/models/hr_contract.py b/hr_contract_reference/models/hr_contract.py index 2969d8c703e..6c65e291ed4 100644 --- a/hr_contract_reference/models/hr_contract.py +++ b/hr_contract_reference/models/hr_contract.py @@ -1,28 +1,11 @@ -# -*- coding:utf-8 -*- -############################################################################## -# -# Copyright (C) 2011,2013 Michael Telahun Makonnen . -# All Rights Reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# copyright 2011,2013 Michael Telahun Makonnen +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api +from odoo import models, fields, api -class hr_contract(models.Model): +class HrContract(models.Model): _inherit = 'hr.contract' name = fields.Char('Contract Reference', required=False, @@ -32,4 +15,4 @@ class hr_contract(models.Model): def create(self, vals): if vals.get('number', '/') == '/': vals['name'] = self.env['ir.sequence'].next_by_code('contract.ref') - return super(hr_contract, self).create(vals) + return super(HrContract, self).create(vals) diff --git a/hr_contract_reference/views/hr_contract_view.xml b/hr_contract_reference/views/hr_contract_view.xml index bf24da7648a..36363db0494 100644 --- a/hr_contract_reference/views/hr_contract_view.xml +++ b/hr_contract_reference/views/hr_contract_view.xml @@ -1,17 +1,14 @@ - - - - - hr.contract.form.view.inherit.ref - hr.contract - form - - - - - + + + hr.contract.form.view.inherit.ref + hr.contract + form + + + + True - - - \ No newline at end of file + + +