OpenERP - Human Resources

Merge lp:~savoirfairelinux-openerp/openerp-hr/hr_employee_phone_extension into lp:openerp-hr

  1. hr_employee_phone_extension
  2. Merge into 7.0
Status: Merged
Merged at revision: 76
Proposed branch: lp:~savoirfairelinux-openerp/openerp-hr/hr_employee_phone_extension
Merge into: lp:openerp-hr
Diff against target: 252 lines (+221/-0)
6 files modified
hr_employee_phone_extension/__init__.py (+25/-0)
hr_employee_phone_extension/__openerp__.py (+55/-0)
hr_employee_phone_extension/hr.py (+36/-0)
hr_employee_phone_extension/hr_view.xml (+20/-0)
hr_employee_phone_extension/i18n/fr.po (+44/-0)
hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot (+41/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openerp-hr/hr_employee_phone_extension
Reviewer Review Type Date Requested Status
Daniel Reis lgtm, no test Approve
Omar (Pexego) code review Approve
Maxime Chambreuil (http://www.savoirfairelinux.com) code review Approve
Review via email: mp+198620@code.launchpad.net

Description of the change

This module adds fields for internal and external phone extensions for hr_employees

To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve (code review)
Revision history for this message
Daniel Reis (dreis-pt) wrote :

Why is the phone expiration date near the Passport Id.
As far as I can see this will be seen in another separator, "Personal Info", under a "Citizenship & Other Info" section. The user will perceive it as the Passport's expiration date.

review: Needs Information
Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

@Daniel Thank you for pointing that out.

Indeed, that is mislabelled and shouldn't be in the module in the first place.

lp:~savoirfairelinux-openerp/openerp-hr/hr_employee_phone_extension updated
77. By Sandy Carter (http://www.savoirfairelinux.com)

[FIX] Removed experiation date which doesn't belong in this module

Revision history for this message
Omar (Pexego) (omar7r) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Daniel Reis (dreis-pt) :
review: Approve (lgtm, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'hr_employee_phone_extension'
=== added file 'hr_employee_phone_extension/__init__.py'
--- hr_employee_phone_extension/__init__.py 1970-01-01 00:00:00 +0000
+++ hr_employee_phone_extension/__init__.py 2013-12-12 17:01:18 +0000
@@ -0,0 +1,25 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# This module copyright (C) 2013 Savoir-faire Linux
6# (<http://www.savoirfairelinux.com>).
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23import hr
24
25# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
026
=== added file 'hr_employee_phone_extension/__openerp__.py'
--- hr_employee_phone_extension/__openerp__.py 1970-01-01 00:00:00 +0000
+++ hr_employee_phone_extension/__openerp__.py 2013-12-12 17:01:18 +0000
@@ -0,0 +1,55 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# This module copyright (C) 2013 Savoir-faire Linux
6# (<http://www.savoirfairelinux.com>).
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23{
24 'name': 'Employee Phone Extension',
25 'version': '1.0',
26 'category': 'Human Resources',
27 'description': """
28
29Employee Phone Extension
30========================
31This module adds the following to employees :
32* internal_number
33* short_number
34
35
36Contributors
37------------
38* Sandy Carter (sandy.carter@savoirfairelinux.com)
39* El Hadji Dem (elhadji.dem@savoirfairelinux.com)
40 """,
41 'author': 'Savoir-faire Linux',
42 'website': 'http://www.savoirfairelinux.com',
43 'license': 'AGPL-3',
44 'depends': ['hr', ],
45 'data': [
46 'hr_view.xml',
47 ],
48 'demo': [],
49 'test': [],
50 'installable': True,
51 'auto_install': False,
52 'images': [],
53}
54
55# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
056
=== added file 'hr_employee_phone_extension/hr.py'
--- hr_employee_phone_extension/hr.py 1970-01-01 00:00:00 +0000
+++ hr_employee_phone_extension/hr.py 2013-12-12 17:01:18 +0000
@@ -0,0 +1,36 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# This module copyright (C) 2013 Savoir-faire Linux
6# (<http://www.savoirfairelinux.com>).
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23from openerp.osv import fields, orm
24
25
26class hr_employee(orm.Model):
27 _inherit = 'hr.employee'
28
29 _columns = {
30 'internal_number': fields.char('Internal Number', size=20,
31 help='Internal phone number.'),
32 'short_number': fields.char('Short Number', size=20,
33 help='Short phone number.'),
34 }
35
36# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
037
=== added file 'hr_employee_phone_extension/hr_view.xml'
--- hr_employee_phone_extension/hr_view.xml 1970-01-01 00:00:00 +0000
+++ hr_employee_phone_extension/hr_view.xml 2013-12-12 17:01:18 +0000
@@ -0,0 +1,20 @@
1<?xml version = "1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <record id="view_employee_form_inherit_extension" model="ir.ui.view">
6 <field name="name">view.employee.form.inherit.extension</field>
7 <field name="model">hr.employee</field>
8 <field name="inherit_id" ref="hr.view_employee_form"/>
9 <field name="arch" type="xml">
10
11 <field name="mobile_phone" position="after">
12 <field name="internal_number" />
13 <field name="short_number" />
14 </field>
15
16 </field>
17 </record>
18
19 </data>
20</openerp>
021
=== added directory 'hr_employee_phone_extension/i18n'
=== added file 'hr_employee_phone_extension/i18n/fr.po'
--- hr_employee_phone_extension/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ hr_employee_phone_extension/i18n/fr.po 2013-12-12 17:01:18 +0000
@@ -0,0 +1,44 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * hr_employee_phone_extension
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-12-12 16:57+0000\n"
10"PO-Revision-Date: 2013-12-12 11:58-0500\n"
11"Last-Translator: Sandy Carter <sandy.carter@savoirfairelinux.com>\n"
12"Language-Team: Savoir-faire Linux\n"
13"Language: fr\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n > 1);\n"
18"X-Generator: Poedit 1.5.7\n"
19"X-Poedit-SourceCharset: UTF-8\n"
20
21#. module: hr_employee_phone_extension
22#: model:ir.model,name:hr_employee_phone_extension.model_hr_employee
23msgid "Employee"
24msgstr "Employé"
25
26#. module: hr_employee_phone_extension
27#: field:hr.employee,internal_number:0
28msgid "Internal Number"
29msgstr "Numéro interne"
30
31#. module: hr_employee_phone_extension
32#: help:hr.employee,internal_number:0
33msgid "Internal phone number."
34msgstr "Numéro de téléphone à l'interne."
35
36#. module: hr_employee_phone_extension
37#: help:hr.employee,short_number:0
38msgid "Short phone number."
39msgstr "Forme courte du numéro de téléphone."
40
41#. module: hr_employee_phone_extension
42#: field:hr.employee,short_number:0
43msgid "Short Number"
44msgstr "Numéro court"
045
=== added file 'hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot'
--- hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot 1970-01-01 00:00:00 +0000
+++ hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot 2013-12-12 17:01:18 +0000
@@ -0,0 +1,41 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * hr_employee_phone_extension
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-12-12 16:57+0000\n"
10"PO-Revision-Date: 2013-12-12 16:57+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: hr_employee_phone_extension
19#: model:ir.model,name:hr_employee_phone_extension.model_hr_employee
20msgid "Employee"
21msgstr ""
22
23#. module: hr_employee_phone_extension
24#: field:hr.employee,internal_number:0
25msgid "Internal Number"
26msgstr ""
27
28#. module: hr_employee_phone_extension
29#: help:hr.employee,internal_number:0
30msgid "Internal phone number."
31msgstr ""
32
33#. module: hr_employee_phone_extension
34#: help:hr.employee,short_number:0
35msgid "Short phone number."
36msgstr ""
37
38#. module: hr_employee_phone_extension
39#: field:hr.employee,short_number:0
40msgid "Short Number"
41msgstr ""