Skip to content

Commit

Permalink
Merge pull request #313 from leemannd/10.0-mig-hr_employee_phone_exte…
Browse files Browse the repository at this point in the history
…nsion

[MIG] hr_employee_phone_extension: Migrated to 10.0
  • Loading branch information
yvaucher committed Feb 24, 2017
2 parents 033a87c + b3b292f commit b2c149d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 75 deletions.
6 changes: 3 additions & 3 deletions hr_employee_phone_extension/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr/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 <https://github.com/OCA/hr/issues/new?body=module:%20hr_employee_phone_extension%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback.


Credits
Expand All @@ -28,7 +27,8 @@ Contributors
* El Hadji Dem <elhadji.dem@savoirfairelinux.com>
* Vincent Renaville <vincent.renaville@camptocamp.com>
* Charbel Jacquin <charbel.jacquin@camptocamp.com>

* Denis Leemann <denis.leemann@camptocamp.com>


Maintainer
----------
Expand Down
21 changes: 1 addition & 20 deletions hr_employee_phone_extension/__init__.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# This module copyright (C) 2013 Savoir-faire Linux
# (<http://www.savoirfairelinux.com>).
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import models
28 changes: 5 additions & 23 deletions hr_employee_phone_extension/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# This module copyright (C) 2013 Savoir-faire Linux
# (<http://www.savoirfairelinux.com>).
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# -*- coding: utf-8 -*-
# copyright 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>)
# 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',
Expand All @@ -33,6 +15,6 @@
],
'demo': [],
'test': [],
'installable': False,
'installable': True,
'auto_install': False,
}
3 changes: 2 additions & 1 deletion hr_employee_phone_extension/models/__init__.py
Original file line number Diff line number Diff line change
@@ -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
30 changes: 6 additions & 24 deletions hr_employee_phone_extension/models/hr_employee.py
Original file line number Diff line number Diff line change
@@ -1,32 +1,14 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# This module copyright (C) 2013 Savoir-faire Linux
# (<http://www.savoirfairelinux.com>).
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# -*- coding: utf-8 -*-
# copyright 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>)
# 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.')
6 changes: 2 additions & 4 deletions hr_employee_phone_extension/views/hr_employee_view.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version = "1.0" encoding="utf-8"?>
<openerp>
<data>
<odoo>

<record id="view_employee_form_inherit_extension" model="ir.ui.view">
<field name="name">view.employee.form.inherit.extension</field>
Expand All @@ -16,5 +15,4 @@
</field>
</record>

</data>
</openerp>
</odoo>

0 comments on commit b2c149d

Please sign in to comment.