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

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.

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
1=== added directory 'hr_employee_phone_extension'
2=== added file 'hr_employee_phone_extension/__init__.py'
3--- hr_employee_phone_extension/__init__.py 1970-01-01 00:00:00 +0000
4+++ hr_employee_phone_extension/__init__.py 2013-12-12 17:01:18 +0000
5@@ -0,0 +1,25 @@
6+# -*- encoding: utf-8 -*-
7+##############################################################################
8+#
9+# OpenERP, Open Source Management Solution
10+# This module copyright (C) 2013 Savoir-faire Linux
11+# (<http://www.savoirfairelinux.com>).
12+#
13+# This program is free software: you can redistribute it and/or modify
14+# it under the terms of the GNU Affero General Public License as
15+# published by the Free Software Foundation, either version 3 of the
16+# License, or (at your option) any later version.
17+#
18+# This program is distributed in the hope that it will be useful,
19+# but WITHOUT ANY WARRANTY; without even the implied warranty of
20+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+# GNU Affero General Public License for more details.
22+#
23+# You should have received a copy of the GNU Affero General Public License
24+# along with this program. If not, see <http://www.gnu.org/licenses/>.
25+#
26+##############################################################################
27+
28+import hr
29+
30+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
31
32=== added file 'hr_employee_phone_extension/__openerp__.py'
33--- hr_employee_phone_extension/__openerp__.py 1970-01-01 00:00:00 +0000
34+++ hr_employee_phone_extension/__openerp__.py 2013-12-12 17:01:18 +0000
35@@ -0,0 +1,55 @@
36+# -*- encoding: utf-8 -*-
37+##############################################################################
38+#
39+# OpenERP, Open Source Management Solution
40+# This module copyright (C) 2013 Savoir-faire Linux
41+# (<http://www.savoirfairelinux.com>).
42+#
43+# This program is free software: you can redistribute it and/or modify
44+# it under the terms of the GNU Affero General Public License as
45+# published by the Free Software Foundation, either version 3 of the
46+# License, or (at your option) any later version.
47+#
48+# This program is distributed in the hope that it will be useful,
49+# but WITHOUT ANY WARRANTY; without even the implied warranty of
50+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
51+# GNU Affero General Public License for more details.
52+#
53+# You should have received a copy of the GNU Affero General Public License
54+# along with this program. If not, see <http://www.gnu.org/licenses/>.
55+#
56+##############################################################################
57+
58+{
59+ 'name': 'Employee Phone Extension',
60+ 'version': '1.0',
61+ 'category': 'Human Resources',
62+ 'description': """
63+
64+Employee Phone Extension
65+========================
66+This module adds the following to employees :
67+* internal_number
68+* short_number
69+
70+
71+Contributors
72+------------
73+* Sandy Carter (sandy.carter@savoirfairelinux.com)
74+* El Hadji Dem (elhadji.dem@savoirfairelinux.com)
75+ """,
76+ 'author': 'Savoir-faire Linux',
77+ 'website': 'http://www.savoirfairelinux.com',
78+ 'license': 'AGPL-3',
79+ 'depends': ['hr', ],
80+ 'data': [
81+ 'hr_view.xml',
82+ ],
83+ 'demo': [],
84+ 'test': [],
85+ 'installable': True,
86+ 'auto_install': False,
87+ 'images': [],
88+}
89+
90+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
91
92=== added file 'hr_employee_phone_extension/hr.py'
93--- hr_employee_phone_extension/hr.py 1970-01-01 00:00:00 +0000
94+++ hr_employee_phone_extension/hr.py 2013-12-12 17:01:18 +0000
95@@ -0,0 +1,36 @@
96+# -*- encoding: utf-8 -*-
97+##############################################################################
98+#
99+# OpenERP, Open Source Management Solution
100+# This module copyright (C) 2013 Savoir-faire Linux
101+# (<http://www.savoirfairelinux.com>).
102+#
103+# This program is free software: you can redistribute it and/or modify
104+# it under the terms of the GNU Affero General Public License as
105+# published by the Free Software Foundation, either version 3 of the
106+# License, or (at your option) any later version.
107+#
108+# This program is distributed in the hope that it will be useful,
109+# but WITHOUT ANY WARRANTY; without even the implied warranty of
110+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
111+# GNU Affero General Public License for more details.
112+#
113+# You should have received a copy of the GNU Affero General Public License
114+# along with this program. If not, see <http://www.gnu.org/licenses/>.
115+#
116+##############################################################################
117+
118+from openerp.osv import fields, orm
119+
120+
121+class hr_employee(orm.Model):
122+ _inherit = 'hr.employee'
123+
124+ _columns = {
125+ 'internal_number': fields.char('Internal Number', size=20,
126+ help='Internal phone number.'),
127+ 'short_number': fields.char('Short Number', size=20,
128+ help='Short phone number.'),
129+ }
130+
131+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
132
133=== added file 'hr_employee_phone_extension/hr_view.xml'
134--- hr_employee_phone_extension/hr_view.xml 1970-01-01 00:00:00 +0000
135+++ hr_employee_phone_extension/hr_view.xml 2013-12-12 17:01:18 +0000
136@@ -0,0 +1,20 @@
137+<?xml version = "1.0" encoding="utf-8"?>
138+<openerp>
139+ <data>
140+
141+ <record id="view_employee_form_inherit_extension" model="ir.ui.view">
142+ <field name="name">view.employee.form.inherit.extension</field>
143+ <field name="model">hr.employee</field>
144+ <field name="inherit_id" ref="hr.view_employee_form"/>
145+ <field name="arch" type="xml">
146+
147+ <field name="mobile_phone" position="after">
148+ <field name="internal_number" />
149+ <field name="short_number" />
150+ </field>
151+
152+ </field>
153+ </record>
154+
155+ </data>
156+</openerp>
157
158=== added directory 'hr_employee_phone_extension/i18n'
159=== added file 'hr_employee_phone_extension/i18n/fr.po'
160--- hr_employee_phone_extension/i18n/fr.po 1970-01-01 00:00:00 +0000
161+++ hr_employee_phone_extension/i18n/fr.po 2013-12-12 17:01:18 +0000
162@@ -0,0 +1,44 @@
163+# Translation of OpenERP Server.
164+# This file contains the translation of the following modules:
165+# * hr_employee_phone_extension
166+#
167+msgid ""
168+msgstr ""
169+"Project-Id-Version: OpenERP Server 7.0\n"
170+"Report-Msgid-Bugs-To: \n"
171+"POT-Creation-Date: 2013-12-12 16:57+0000\n"
172+"PO-Revision-Date: 2013-12-12 11:58-0500\n"
173+"Last-Translator: Sandy Carter <sandy.carter@savoirfairelinux.com>\n"
174+"Language-Team: Savoir-faire Linux\n"
175+"Language: fr\n"
176+"MIME-Version: 1.0\n"
177+"Content-Type: text/plain; charset=UTF-8\n"
178+"Content-Transfer-Encoding: 8bit\n"
179+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
180+"X-Generator: Poedit 1.5.7\n"
181+"X-Poedit-SourceCharset: UTF-8\n"
182+
183+#. module: hr_employee_phone_extension
184+#: model:ir.model,name:hr_employee_phone_extension.model_hr_employee
185+msgid "Employee"
186+msgstr "Employé"
187+
188+#. module: hr_employee_phone_extension
189+#: field:hr.employee,internal_number:0
190+msgid "Internal Number"
191+msgstr "Numéro interne"
192+
193+#. module: hr_employee_phone_extension
194+#: help:hr.employee,internal_number:0
195+msgid "Internal phone number."
196+msgstr "Numéro de téléphone à l'interne."
197+
198+#. module: hr_employee_phone_extension
199+#: help:hr.employee,short_number:0
200+msgid "Short phone number."
201+msgstr "Forme courte du numéro de téléphone."
202+
203+#. module: hr_employee_phone_extension
204+#: field:hr.employee,short_number:0
205+msgid "Short Number"
206+msgstr "Numéro court"
207
208=== added file 'hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot'
209--- hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot 1970-01-01 00:00:00 +0000
210+++ hr_employee_phone_extension/i18n/hr_employee_phone_extension.pot 2013-12-12 17:01:18 +0000
211@@ -0,0 +1,41 @@
212+# Translation of OpenERP Server.
213+# This file contains the translation of the following modules:
214+# * hr_employee_phone_extension
215+#
216+msgid ""
217+msgstr ""
218+"Project-Id-Version: OpenERP Server 7.0\n"
219+"Report-Msgid-Bugs-To: \n"
220+"POT-Creation-Date: 2013-12-12 16:57+0000\n"
221+"PO-Revision-Date: 2013-12-12 16:57+0000\n"
222+"Last-Translator: <>\n"
223+"Language-Team: \n"
224+"MIME-Version: 1.0\n"
225+"Content-Type: text/plain; charset=UTF-8\n"
226+"Content-Transfer-Encoding: \n"
227+"Plural-Forms: \n"
228+
229+#. module: hr_employee_phone_extension
230+#: model:ir.model,name:hr_employee_phone_extension.model_hr_employee
231+msgid "Employee"
232+msgstr ""
233+
234+#. module: hr_employee_phone_extension
235+#: field:hr.employee,internal_number:0
236+msgid "Internal Number"
237+msgstr ""
238+
239+#. module: hr_employee_phone_extension
240+#: help:hr.employee,internal_number:0
241+msgid "Internal phone number."
242+msgstr ""
243+
244+#. module: hr_employee_phone_extension
245+#: help:hr.employee,short_number:0
246+msgid "Short phone number."
247+msgstr ""
248+
249+#. module: hr_employee_phone_extension
250+#: field:hr.employee,short_number:0
251+msgid "Short Number"
252+msgstr ""