From b3b292fa859d4c5ef43b985b4e8c8afef5f4b0a9 Mon Sep 17 00:00:00 2001 From: Denis Leemann Date: Wed, 22 Feb 2017 11:17:55 +0100 Subject: [PATCH] [MIG] hr_employee_phone_extension: Migrated to 10.0 --- hr_employee_phone_extension/README.rst | 6 ++-- hr_employee_phone_extension/__init__.py | 21 +------------ hr_employee_phone_extension/__manifest__.py | 28 ++++------------- .../models/__init__.py | 3 +- .../models/hr_employee.py | 30 ++++--------------- .../views/hr_employee_view.xml | 6 ++-- 6 files changed, 19 insertions(+), 75 deletions(-) diff --git a/hr_employee_phone_extension/README.rst b/hr_employee_phone_extension/README.rst index d8351b8e289..ca23fd9e9dd 100644 --- a/hr_employee_phone_extension/README.rst +++ b/hr_employee_phone_extension/README.rst @@ -14,8 +14,7 @@ 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 -`here `_. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback. Credits @@ -28,7 +27,8 @@ Contributors * El Hadji Dem * Vincent Renaville * Charbel Jacquin - +* Denis Leemann + Maintainer ---------- diff --git a/hr_employee_phone_extension/__init__.py b/hr_employee_phone_extension/__init__.py index 29db66cd90f..9b2c189f76c 100644 --- a/hr_employee_phone_extension/__init__.py +++ b/hr_employee_phone_extension/__init__.py @@ -1,23 +1,4 @@ # -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux -# (). -# -# 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 . -# -############################################################################## +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/hr_employee_phone_extension/__manifest__.py b/hr_employee_phone_extension/__manifest__.py index 82263203123..11743407baf 100644 --- a/hr_employee_phone_extension/__manifest__.py +++ b/hr_employee_phone_extension/__manifest__.py @@ -1,28 +1,10 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux -# (). -# -# 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 2013 Savoir-faire Linux () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Employee Phone Extension', - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Human Resources', 'author': "Savoir-faire Linux,Odoo Community Association (OCA)", 'website': 'http://www.savoirfairelinux.com', @@ -33,6 +15,6 @@ ], 'demo': [], 'test': [], - 'installable': False, + 'installable': True, 'auto_install': False, } diff --git a/hr_employee_phone_extension/models/__init__.py b/hr_employee_phone_extension/models/__init__.py index ddb17be25cb..6f262451f39 100644 --- a/hr_employee_phone_extension/models/__init__.py +++ b/hr_employee_phone_extension/models/__init__.py @@ -1,3 +1,4 @@ -#! -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import hr_employee diff --git a/hr_employee_phone_extension/models/hr_employee.py b/hr_employee_phone_extension/models/hr_employee.py index 79cbf732b99..32dd4eb81f7 100644 --- a/hr_employee_phone_extension/models/hr_employee.py +++ b/hr_employee_phone_extension/models/hr_employee.py @@ -1,32 +1,14 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux -# (). -# -# 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 2013 Savoir-faire Linux () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields +from odoo import models, fields class HrEmployee(models.Model): _inherit = 'hr.employee' - internal_number = fields.Char('Internal Number', size=20, + internal_number = fields.Char('Internal Number', help='Internal phone number.') - short_number = fields.Char('Short Number', size=20, + short_number = fields.Char('Short Number', help='Short phone number.') diff --git a/hr_employee_phone_extension/views/hr_employee_view.xml b/hr_employee_phone_extension/views/hr_employee_view.xml index f1da74aae7d..0bd51dc1019 100644 --- a/hr_employee_phone_extension/views/hr_employee_view.xml +++ b/hr_employee_phone_extension/views/hr_employee_view.xml @@ -1,6 +1,5 @@ - - + view.employee.form.inherit.extension @@ -16,5 +15,4 @@ - - +