Merge lp:~savoirfairelinux-openerp/openerp-hr/language into lp:openerp-hr/6.1
- language
- Merge into 6.1
Status: | Rejected |
---|---|
Rejected by: | Sandy Carter (http://www.savoirfairelinux.com) |
Proposed branch: | lp:~savoirfairelinux-openerp/openerp-hr/language |
Merge into: | lp:openerp-hr/6.1 |
Diff against target: |
687 lines (+655/-0) 6 files modified
hr_language/__init__.py (+24/-0) hr_language/__openerp__.py (+51/-0) hr_language/hr_language.py (+49/-0) hr_language/hr_language_view.xml (+67/-0) hr_language/i18n/hr_language.pot (+462/-0) hr_language/security/ir.model.access.csv (+2/-0) |
To merge this branch: | bzr merge lp:~savoirfairelinux-openerp/openerp-hr/language |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Fayolle - camptocamp | code review, no tests | Approve | |
Yannick Vaucher @ Camptocamp | Needs Information | ||
Pedro Manuel Baeza | Needs Information | ||
Joao Alfredo Gama Batista | code review. no test | Needs Fixing | |
Maxime Chambreuil (http://www.savoirfairelinux.com) | code review | Approve | |
Review via email: mp+194925@code.launchpad.net |
Commit message
Description of the change
[ADD] add hr_language module.It adds a new menu in hr module.This module depends on hr module
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) : | # |
- 307. By EL HADJI DEM <email address hidden>
-
[IMP] add pot file
Joao Alfredo Gama Batista (joao-gama) wrote : | # |
- 308. By El Hadji Dem (http://www.savoirfairelinux.com)
-
[PEP8] pep8
- 309. By El Hadji Dem (http://www.savoirfairelinux.com)
-
[pep8] pep8
- 310. By Maxime Chambreuil (http://www.savoirfairelinux.com)
-
[FIX] Based on MP reviews. Improve XML readability
El Hadji Dem (http://www.savoirfairelinux.com) (eh-dem) wrote : | # |
thanks maxime
- 311. By Maxime Chambreuil (http://www.savoirfairelinux.com)
-
[IMP] Update translation file
Pedro Manuel Baeza (pedro.baeza) wrote : | # |
Hi, El Hadji,
Thanks for the MP. I see something strange with language selection, because all the language names needs to be translated and appear in the pot file. Isn't any other machanism that uses translations made on base module.
Regards.
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote : | # |
Hello Pedro,
Good catch Pedro ;) Problem is that an employee may speak, read or write a language which is not installed in OpenERP. That's why we decided to get the list of languages from tools.scan_
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote : | # |
Wouldn't it be more interesting to have a level of language like http://
Or something like Linkedin language levels ?
Than a simple true / false ?
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote : | # |
@Yannick
You are right. Same thing would apply for skills evaluation.
We wanted to start simple to generate a resume, where languages and skills would appear or not.
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote : | # |
LGTM
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote : | # |
Ported to https:/
Unmerged revisions
- 311. By Maxime Chambreuil (http://www.savoirfairelinux.com)
-
[IMP] Update translation file
- 310. By Maxime Chambreuil (http://www.savoirfairelinux.com)
-
[FIX] Based on MP reviews. Improve XML readability
- 309. By El Hadji Dem (http://www.savoirfairelinux.com)
-
[pep8] pep8
- 308. By El Hadji Dem (http://www.savoirfairelinux.com)
-
[PEP8] pep8
- 307. By EL HADJI DEM <email address hidden>
-
[IMP] add pot file
- 306. By EL HADJI DEM <email address hidden>
-
[add] add hr_language module
Preview Diff
1 | === added directory 'hr_language' | |||
2 | === added file 'hr_language/__init__.py' | |||
3 | --- hr_language/__init__.py 1970-01-01 00:00:00 +0000 | |||
4 | +++ hr_language/__init__.py 2013-12-31 21:40:09 +0000 | |||
5 | @@ -0,0 +1,24 @@ | |||
6 | 1 | # -*- encoding: utf-8 -*- | ||
7 | 2 | ############################################################################### | ||
8 | 3 | # | ||
9 | 4 | # OpenERP, Open Source Management Solution | ||
10 | 5 | # Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>). | ||
11 | 6 | # | ||
12 | 7 | # This program is free software: you can redistribute it and/or modify | ||
13 | 8 | # it under the terms of the GNU Affero General Public License as | ||
14 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
15 | 10 | # License, or (at your option) any later version. | ||
16 | 11 | # | ||
17 | 12 | # This program is distributed in the hope that it will be useful, | ||
18 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
20 | 15 | # GNU Affero General Public License for more details. | ||
21 | 16 | # | ||
22 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
23 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
24 | 19 | # | ||
25 | 20 | ############################################################################### | ||
26 | 21 | |||
27 | 22 | from . import hr_language | ||
28 | 23 | |||
29 | 24 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | ||
30 | 0 | 25 | ||
31 | === added file 'hr_language/__openerp__.py' | |||
32 | --- hr_language/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
33 | +++ hr_language/__openerp__.py 2013-12-31 21:40:09 +0000 | |||
34 | @@ -0,0 +1,51 @@ | |||
35 | 1 | # -*- encoding: utf-8 -*- | ||
36 | 2 | ############################################################################### | ||
37 | 3 | # | ||
38 | 4 | # OpenERP, Open Source Management Solution | ||
39 | 5 | # Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>). | ||
40 | 6 | # | ||
41 | 7 | # This program is free software: you can redistribute it and/or modify | ||
42 | 8 | # it under the terms of the GNU Affero General Public License as | ||
43 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
44 | 10 | # License, or (at your option) any later version. | ||
45 | 11 | # | ||
46 | 12 | # This program is distributed in the hope that it will be useful, | ||
47 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
48 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
49 | 15 | # GNU Affero General Public License for more details. | ||
50 | 16 | # | ||
51 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
52 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
53 | 19 | # | ||
54 | 20 | ############################################################################### | ||
55 | 21 | |||
56 | 22 | { | ||
57 | 23 | "name": "Language Management", | ||
58 | 24 | "version": "0.1", | ||
59 | 25 | "author": "Savoir-faire Linux", | ||
60 | 26 | "maintainer": "Savoir-faire Linux", | ||
61 | 27 | "website": "http://www.savoirfairelinux.com", | ||
62 | 28 | "category": "Human Resources", | ||
63 | 29 | "description": """ | ||
64 | 30 | Language Management | ||
65 | 31 | =================== | ||
66 | 32 | |||
67 | 33 | This module allows you to manage your employee languages. | ||
68 | 34 | |||
69 | 35 | Contributors | ||
70 | 36 | ------------ | ||
71 | 37 | * El Hadji DEM (elhadji.dem@savoirfairelinux.com) | ||
72 | 38 | """, | ||
73 | 39 | "depends": ["hr", ], | ||
74 | 40 | "external_dependencies": {}, | ||
75 | 41 | 'data': [ | ||
76 | 42 | "security/ir.model.access.csv", | ||
77 | 43 | "hr_language_view.xml", | ||
78 | 44 | ], | ||
79 | 45 | "demo": [], | ||
80 | 46 | "test": [], | ||
81 | 47 | "installable": True, | ||
82 | 48 | "active": False, | ||
83 | 49 | } | ||
84 | 50 | |||
85 | 51 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | ||
86 | 0 | 52 | ||
87 | === added file 'hr_language/hr_language.py' | |||
88 | --- hr_language/hr_language.py 1970-01-01 00:00:00 +0000 | |||
89 | +++ hr_language/hr_language.py 2013-12-31 21:40:09 +0000 | |||
90 | @@ -0,0 +1,49 @@ | |||
91 | 1 | # -*- encoding: utf-8 -*- | ||
92 | 2 | ############################################################################### | ||
93 | 3 | # | ||
94 | 4 | # OpenERP, Open Source Management Solution | ||
95 | 5 | # Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>). | ||
96 | 6 | # | ||
97 | 7 | # This program is free software: you can redistribute it and/or modify | ||
98 | 8 | # it under the terms of the GNU Affero General Public License as | ||
99 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
100 | 10 | # License, or (at your option) any later version. | ||
101 | 11 | # | ||
102 | 12 | # This program is distributed in the hope that it will be useful, | ||
103 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
104 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
105 | 15 | # GNU Affero General Public License for more details. | ||
106 | 16 | # | ||
107 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
108 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
109 | 19 | # | ||
110 | 20 | ############################################################################### | ||
111 | 21 | |||
112 | 22 | import tools | ||
113 | 23 | from openerp.osv import fields, orm | ||
114 | 24 | |||
115 | 25 | |||
116 | 26 | class hr_language(orm.Model): | ||
117 | 27 | _name = 'hr.language' | ||
118 | 28 | _columns = { | ||
119 | 29 | 'name': fields.selection(tools.scan_languages(), 'Language', required=True), | ||
120 | 30 | 'description': fields.char('Description', size=64, required=True, translate=True), | ||
121 | 31 | 'employee_id': fields.many2one('hr.employee', 'Employee', required=True), | ||
122 | 32 | 'read': fields.boolean('Read'), | ||
123 | 33 | 'write': fields.boolean('Write'), | ||
124 | 34 | 'speak': fields.boolean('Speak'), | ||
125 | 35 | } | ||
126 | 36 | _defaults = { | ||
127 | 37 | 'read': True, | ||
128 | 38 | 'write': True, | ||
129 | 39 | 'speak': True, | ||
130 | 40 | } | ||
131 | 41 | |||
132 | 42 | |||
133 | 43 | class hr_employee(orm.Model): | ||
134 | 44 | _inherit = 'hr.employee' | ||
135 | 45 | _columns = { | ||
136 | 46 | 'language_ids': fields.one2many('hr.language', 'employee_id', 'Languages'), | ||
137 | 47 | } | ||
138 | 48 | |||
139 | 49 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | ||
140 | 0 | 50 | ||
141 | === added file 'hr_language/hr_language_view.xml' | |||
142 | --- hr_language/hr_language_view.xml 1970-01-01 00:00:00 +0000 | |||
143 | +++ hr_language/hr_language_view.xml 2013-12-31 21:40:09 +0000 | |||
144 | @@ -0,0 +1,67 @@ | |||
145 | 1 | <openerp> | ||
146 | 2 | <data> | ||
147 | 3 | |||
148 | 4 | <!-- inherit Employee --> | ||
149 | 5 | <record model="ir.ui.view" id="view_employee_form"> | ||
150 | 6 | <field name="name">hr.language.employee.form</field> | ||
151 | 7 | <field name="model">hr.employee</field> | ||
152 | 8 | <field name="type">form</field> | ||
153 | 9 | <field name="inherit_id" ref="hr.view_employee_form"/> | ||
154 | 10 | <field name="arch" type="xml"> | ||
155 | 11 | <notebook position="inside"> | ||
156 | 12 | <page string="Languages"> | ||
157 | 13 | <field name="language_ids" nolabel="1" colspan="4"/> | ||
158 | 14 | </page> | ||
159 | 15 | </notebook> | ||
160 | 16 | </field> | ||
161 | 17 | </record> | ||
162 | 18 | |||
163 | 19 | <!-- Language tree --> | ||
164 | 20 | <record model="ir.ui.view" id="view_language_tree"> | ||
165 | 21 | <field name="name">hr.language.tree</field> | ||
166 | 22 | <field name="model">hr.language</field> | ||
167 | 23 | <field name="type">tree</field> | ||
168 | 24 | <field name="arch" type="xml"> | ||
169 | 25 | <tree string="Languages"> | ||
170 | 26 | <field name="description"/> | ||
171 | 27 | <field name="read"/> | ||
172 | 28 | <field name="write"/> | ||
173 | 29 | <field name="speak"/> | ||
174 | 30 | </tree> | ||
175 | 31 | </field> | ||
176 | 32 | </record> | ||
177 | 33 | |||
178 | 34 | <!-- Language form --> | ||
179 | 35 | <record model="ir.ui.view" id="view_language_form"> | ||
180 | 36 | <field name="name">hr.language.form</field> | ||
181 | 37 | <field name="model">hr.language</field> | ||
182 | 38 | <field name="type">form</field> | ||
183 | 39 | <field name="arch" type="xml"> | ||
184 | 40 | <form string="Language"> | ||
185 | 41 | <field name="name"/> | ||
186 | 42 | <field name="description"/> | ||
187 | 43 | <field name="employee_id"/> | ||
188 | 44 | <newline/> | ||
189 | 45 | <field name="read"/> | ||
190 | 46 | <newline/> | ||
191 | 47 | <field name="write"/> | ||
192 | 48 | <newline/> | ||
193 | 49 | <field name="speak"/> | ||
194 | 50 | </form> | ||
195 | 51 | </field> | ||
196 | 52 | </record> | ||
197 | 53 | |||
198 | 54 | <!-- Menu --> | ||
199 | 55 | <record model="ir.actions.act_window" id="open_view_language_form"> | ||
200 | 56 | <field name="res_model">hr.language</field> | ||
201 | 57 | <field name="view_type">form</field> | ||
202 | 58 | <field name="view_mode">tree,form</field> | ||
203 | 59 | </record> | ||
204 | 60 | |||
205 | 61 | <menuitem name="Languages" | ||
206 | 62 | parent="hr.menu_hr_configuration" | ||
207 | 63 | id="menu_open_view_language_form" | ||
208 | 64 | action="open_view_language_form"/> | ||
209 | 65 | |||
210 | 66 | </data> | ||
211 | 67 | </openerp> | ||
212 | 0 | 68 | ||
213 | === added directory 'hr_language/i18n' | |||
214 | === added file 'hr_language/i18n/hr_language.pot' | |||
215 | --- hr_language/i18n/hr_language.pot 1970-01-01 00:00:00 +0000 | |||
216 | +++ hr_language/i18n/hr_language.pot 2013-12-31 21:40:09 +0000 | |||
217 | @@ -0,0 +1,462 @@ | |||
218 | 1 | # Translation of OpenERP Server. | ||
219 | 2 | # This file contains the translation of the following modules: | ||
220 | 3 | # * hr_language | ||
221 | 4 | # | ||
222 | 5 | msgid "" | ||
223 | 6 | msgstr "" | ||
224 | 7 | "Project-Id-Version: OpenERP Server 6.1\n" | ||
225 | 8 | "Report-Msgid-Bugs-To: \n" | ||
226 | 9 | "POT-Creation-Date: 2013-12-31 21:38+0000\n" | ||
227 | 10 | "PO-Revision-Date: 2013-12-31 21:38+0000\n" | ||
228 | 11 | "Last-Translator: <>\n" | ||
229 | 12 | "Language-Team: \n" | ||
230 | 13 | "MIME-Version: 1.0\n" | ||
231 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
232 | 15 | "Content-Transfer-Encoding: \n" | ||
233 | 16 | "Plural-Forms: \n" | ||
234 | 17 | |||
235 | 18 | #. module: hr_language | ||
236 | 19 | #: selection:hr.language,name:0 | ||
237 | 20 | msgid "Croatian / hrvatski jezik" | ||
238 | 21 | msgstr "" | ||
239 | 22 | |||
240 | 23 | #. module: hr_language | ||
241 | 24 | #: selection:hr.language,name:0 | ||
242 | 25 | msgid "English (CA)" | ||
243 | 26 | msgstr "" | ||
244 | 27 | |||
245 | 28 | #. module: hr_language | ||
246 | 29 | #: selection:hr.language,name:0 | ||
247 | 30 | msgid "Romanian / română" | ||
248 | 31 | msgstr "" | ||
249 | 32 | |||
250 | 33 | #. module: hr_language | ||
251 | 34 | #: selection:hr.language,name:0 | ||
252 | 35 | msgid "Albanian / Shqip" | ||
253 | 36 | msgstr "" | ||
254 | 37 | |||
255 | 38 | #. module: hr_language | ||
256 | 39 | #: selection:hr.language,name:0 | ||
257 | 40 | msgid "Hebrew / עִבְרִי" | ||
258 | 41 | msgstr "" | ||
259 | 42 | |||
260 | 43 | #. module: hr_language | ||
261 | 44 | #: selection:hr.language,name:0 | ||
262 | 45 | msgid "Sinhalese / සිංහල" | ||
263 | 46 | msgstr "" | ||
264 | 47 | |||
265 | 48 | #. module: hr_language | ||
266 | 49 | #: selection:hr.language,name:0 | ||
267 | 50 | msgid "Spanish (EC) / Español (EC)" | ||
268 | 51 | msgstr "" | ||
269 | 52 | |||
270 | 53 | #. module: hr_language | ||
271 | 54 | #: selection:hr.language,name:0 | ||
272 | 55 | msgid "Spanish (PR) / Español (PR)" | ||
273 | 56 | msgstr "" | ||
274 | 57 | |||
275 | 58 | #. module: hr_language | ||
276 | 59 | #: selection:hr.language,name:0 | ||
277 | 60 | msgid "Hungarian / Magyar" | ||
278 | 61 | msgstr "" | ||
279 | 62 | |||
280 | 63 | #. module: hr_language | ||
281 | 64 | #: selection:hr.language,name:0 | ||
282 | 65 | msgid "Telugu / తెలుగు" | ||
283 | 66 | msgstr "" | ||
284 | 67 | |||
285 | 68 | #. module: hr_language | ||
286 | 69 | #: selection:hr.language,name:0 | ||
287 | 70 | msgid "Spanish (VE) / Español (VE)" | ||
288 | 71 | msgstr "" | ||
289 | 72 | |||
290 | 73 | #. module: hr_language | ||
291 | 74 | #: selection:hr.language,name:0 | ||
292 | 75 | msgid "Lithuanian / Lietuvių kalba" | ||
293 | 76 | msgstr "" | ||
294 | 77 | |||
295 | 78 | #. module: hr_language | ||
296 | 79 | #: selection:hr.language,name:0 | ||
297 | 80 | msgid "Bulgarian / български език" | ||
298 | 81 | msgstr "" | ||
299 | 82 | |||
300 | 83 | #. module: hr_language | ||
301 | 84 | #: selection:hr.language,name:0 | ||
302 | 85 | msgid "Dutch / Nederlands" | ||
303 | 86 | msgstr "" | ||
304 | 87 | |||
305 | 88 | #. module: hr_language | ||
306 | 89 | #: selection:hr.language,name:0 | ||
307 | 90 | msgid "Spanish (UY) / Español (UY)" | ||
308 | 91 | msgstr "" | ||
309 | 92 | |||
310 | 93 | #. module: hr_language | ||
311 | 94 | #: selection:hr.language,name:0 | ||
312 | 95 | msgid "Danish / Dansk" | ||
313 | 96 | msgstr "" | ||
314 | 97 | |||
315 | 98 | #. module: hr_language | ||
316 | 99 | #: selection:hr.language,name:0 | ||
317 | 100 | msgid "Spanish (BO) / Español (BO)" | ||
318 | 101 | msgstr "" | ||
319 | 102 | |||
320 | 103 | #. module: hr_language | ||
321 | 104 | #: selection:hr.language,name:0 | ||
322 | 105 | msgid "Korean (KR) / 한국어 (KR)" | ||
323 | 106 | msgstr "" | ||
324 | 107 | |||
325 | 108 | #. module: hr_language | ||
326 | 109 | #: selection:hr.language,name:0 | ||
327 | 110 | msgid "Spanish (PE) / Español (PE)" | ||
328 | 111 | msgstr "" | ||
329 | 112 | |||
330 | 113 | #. module: hr_language | ||
331 | 114 | #: selection:hr.language,name:0 | ||
332 | 115 | msgid "French (CH) / Français (CH)" | ||
333 | 116 | msgstr "" | ||
334 | 117 | |||
335 | 118 | #. module: hr_language | ||
336 | 119 | #: selection:hr.language,name:0 | ||
337 | 120 | msgid "Arabic / الْعَرَبيّة" | ||
338 | 121 | msgstr "" | ||
339 | 122 | |||
340 | 123 | #. module: hr_language | ||
341 | 124 | #: selection:hr.language,name:0 | ||
342 | 125 | msgid "Abkhazian / аҧсуа" | ||
343 | 126 | msgstr "" | ||
344 | 127 | |||
345 | 128 | #. module: hr_language | ||
346 | 129 | #: selection:hr.language,name:0 | ||
347 | 130 | msgid "Spanish (CO) / Español (CO)" | ||
348 | 131 | msgstr "" | ||
349 | 132 | |||
350 | 133 | #. module: hr_language | ||
351 | 134 | #: selection:hr.language,name:0 | ||
352 | 135 | msgid "Czech / Čeština" | ||
353 | 136 | msgstr "" | ||
354 | 137 | |||
355 | 138 | #. module: hr_language | ||
356 | 139 | #: selection:hr.language,name:0 | ||
357 | 140 | msgid "Gujarati / ગુજરાતી" | ||
358 | 141 | msgstr "" | ||
359 | 142 | |||
360 | 143 | #. module: hr_language | ||
361 | 144 | #: field:hr.language,employee_id:0 | ||
362 | 145 | #: model:ir.model,name:hr_language.model_hr_employee | ||
363 | 146 | msgid "Employee" | ||
364 | 147 | msgstr "" | ||
365 | 148 | |||
366 | 149 | #. module: hr_language | ||
367 | 150 | #: selection:hr.language,name:0 | ||
368 | 151 | msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ" | ||
369 | 152 | msgstr "" | ||
370 | 153 | |||
371 | 154 | #. module: hr_language | ||
372 | 155 | #: selection:hr.language,name:0 | ||
373 | 156 | msgid "Galician / Galego" | ||
374 | 157 | msgstr "" | ||
375 | 158 | |||
376 | 159 | #. module: hr_language | ||
377 | 160 | #: selection:hr.language,name:0 | ||
378 | 161 | msgid "Klingon" | ||
379 | 162 | msgstr "" | ||
380 | 163 | |||
381 | 164 | #. module: hr_language | ||
382 | 165 | #: selection:hr.language,name:0 | ||
383 | 166 | msgid "Spanish (PY) / Español (PY)" | ||
384 | 167 | msgstr "" | ||
385 | 168 | |||
386 | 169 | #. module: hr_language | ||
387 | 170 | #: selection:hr.language,name:0 | ||
388 | 171 | msgid "Urdu / اردو" | ||
389 | 172 | msgstr "" | ||
390 | 173 | |||
391 | 174 | #. module: hr_language | ||
392 | 175 | #: selection:hr.language,name:0 | ||
393 | 176 | msgid "Catalan / Català" | ||
394 | 177 | msgstr "" | ||
395 | 178 | |||
396 | 179 | #. module: hr_language | ||
397 | 180 | #: model:ir.model,name:hr_language.model_hr_language | ||
398 | 181 | msgid "hr.language" | ||
399 | 182 | msgstr "" | ||
400 | 183 | |||
401 | 184 | #. module: hr_language | ||
402 | 185 | #: selection:hr.language,name:0 | ||
403 | 186 | msgid "Serbian (Cyrillic) / српски" | ||
404 | 187 | msgstr "" | ||
405 | 188 | |||
406 | 189 | #. module: hr_language | ||
407 | 190 | #: selection:hr.language,name:0 | ||
408 | 191 | msgid "Flemish (BE) / Vlaams (BE)" | ||
409 | 192 | msgstr "" | ||
410 | 193 | |||
411 | 194 | #. module: hr_language | ||
412 | 195 | #: selection:hr.language,name:0 | ||
413 | 196 | msgid "Spanish / Español" | ||
414 | 197 | msgstr "" | ||
415 | 198 | |||
416 | 199 | #. module: hr_language | ||
417 | 200 | #: selection:hr.language,name:0 | ||
418 | 201 | msgid "Chinese (TW) / 正體字" | ||
419 | 202 | msgstr "" | ||
420 | 203 | |||
421 | 204 | #. module: hr_language | ||
422 | 205 | #: selection:hr.language,name:0 | ||
423 | 206 | msgid "Korean (KP) / 한국어 (KP)" | ||
424 | 207 | msgstr "" | ||
425 | 208 | |||
426 | 209 | #. module: hr_language | ||
427 | 210 | #: selection:hr.language,name:0 | ||
428 | 211 | msgid "Portugese (BR) / Português (BR)" | ||
429 | 212 | msgstr "" | ||
430 | 213 | |||
431 | 214 | #. module: hr_language | ||
432 | 215 | #: selection:hr.language,name:0 | ||
433 | 216 | msgid "Ukrainian / українська" | ||
434 | 217 | msgstr "" | ||
435 | 218 | |||
436 | 219 | #. module: hr_language | ||
437 | 220 | #: selection:hr.language,name:0 | ||
438 | 221 | msgid "Spanish (AR) / Español (AR)" | ||
439 | 222 | msgstr "" | ||
440 | 223 | |||
441 | 224 | #. module: hr_language | ||
442 | 225 | #: selection:hr.language,name:0 | ||
443 | 226 | msgid "Chinese (HK)" | ||
444 | 227 | msgstr "" | ||
445 | 228 | |||
446 | 229 | #. module: hr_language | ||
447 | 230 | #: field:hr.language,speak:0 | ||
448 | 231 | msgid "Speak" | ||
449 | 232 | msgstr "" | ||
450 | 233 | |||
451 | 234 | #. module: hr_language | ||
452 | 235 | #: selection:hr.language,name:0 | ||
453 | 236 | msgid "Spanish (GT) / Español (GT)" | ||
454 | 237 | msgstr "" | ||
455 | 238 | |||
456 | 239 | #. module: hr_language | ||
457 | 240 | #: selection:hr.language,name:0 | ||
458 | 241 | msgid "Indonesian / Bahasa Indonesia" | ||
459 | 242 | msgstr "" | ||
460 | 243 | |||
461 | 244 | #. module: hr_language | ||
462 | 245 | #: view:hr.employee:0 | ||
463 | 246 | #: field:hr.employee,language_ids:0 | ||
464 | 247 | #: view:hr.language:0 | ||
465 | 248 | #: model:ir.ui.menu,name:hr_language.menu_open_view_language_form | ||
466 | 249 | msgid "Languages" | ||
467 | 250 | msgstr "" | ||
468 | 251 | |||
469 | 252 | #. module: hr_language | ||
470 | 253 | #: selection:hr.language,name:0 | ||
471 | 254 | msgid "Spanish (PA) / Español (PA)" | ||
472 | 255 | msgstr "" | ||
473 | 256 | |||
474 | 257 | #. module: hr_language | ||
475 | 258 | #: selection:hr.language,name:0 | ||
476 | 259 | msgid "Vietnamese / Tiếng Việt" | ||
477 | 260 | msgstr "" | ||
478 | 261 | |||
479 | 262 | #. module: hr_language | ||
480 | 263 | #: selection:hr.language,name:0 | ||
481 | 264 | msgid "Slovak / Slovenský jazyk" | ||
482 | 265 | msgstr "" | ||
483 | 266 | |||
484 | 267 | #. module: hr_language | ||
485 | 268 | #: selection:hr.language,name:0 | ||
486 | 269 | msgid "Latvian / latviešu valoda" | ||
487 | 270 | msgstr "" | ||
488 | 271 | |||
489 | 272 | #. module: hr_language | ||
490 | 273 | #: selection:hr.language,name:0 | ||
491 | 274 | msgid "Spanish (CL) / Español (CL)" | ||
492 | 275 | msgstr "" | ||
493 | 276 | |||
494 | 277 | #. module: hr_language | ||
495 | 278 | #: constraint:hr.employee:0 | ||
496 | 279 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
497 | 280 | msgstr "" | ||
498 | 281 | |||
499 | 282 | #. module: hr_language | ||
500 | 283 | #: view:hr.language:0 | ||
501 | 284 | #: field:hr.language,name:0 | ||
502 | 285 | msgid "Language" | ||
503 | 286 | msgstr "" | ||
504 | 287 | |||
505 | 288 | #. module: hr_language | ||
506 | 289 | #: selection:hr.language,name:0 | ||
507 | 290 | msgid "Italian / Italiano" | ||
508 | 291 | msgstr "" | ||
509 | 292 | |||
510 | 293 | #. module: hr_language | ||
511 | 294 | #: selection:hr.language,name:0 | ||
512 | 295 | msgid "Bosnian / bosanski jezik" | ||
513 | 296 | msgstr "" | ||
514 | 297 | |||
515 | 298 | #. module: hr_language | ||
516 | 299 | #: selection:hr.language,name:0 | ||
517 | 300 | msgid "Spanish (DO) / Español (DO)" | ||
518 | 301 | msgstr "" | ||
519 | 302 | |||
520 | 303 | #. module: hr_language | ||
521 | 304 | #: selection:hr.language,name:0 | ||
522 | 305 | msgid "Norwegian Bokmål / Norsk bokmål" | ||
523 | 306 | msgstr "" | ||
524 | 307 | |||
525 | 308 | #. module: hr_language | ||
526 | 309 | #: field:hr.language,write:0 | ||
527 | 310 | msgid "Write" | ||
528 | 311 | msgstr "" | ||
529 | 312 | |||
530 | 313 | #. module: hr_language | ||
531 | 314 | #: selection:hr.language,name:0 | ||
532 | 315 | msgid "Finnish / Suomi" | ||
533 | 316 | msgstr "" | ||
534 | 317 | |||
535 | 318 | #. module: hr_language | ||
536 | 319 | #: selection:hr.language,name:0 | ||
537 | 320 | msgid "German / Deutsch" | ||
538 | 321 | msgstr "" | ||
539 | 322 | |||
540 | 323 | #. module: hr_language | ||
541 | 324 | #: selection:hr.language,name:0 | ||
542 | 325 | msgid "Spanish (MX) / Español (MX)" | ||
543 | 326 | msgstr "" | ||
544 | 327 | |||
545 | 328 | #. module: hr_language | ||
546 | 329 | #: selection:hr.language,name:0 | ||
547 | 330 | msgid "Portugese / Português" | ||
548 | 331 | msgstr "" | ||
549 | 332 | |||
550 | 333 | #. module: hr_language | ||
551 | 334 | #: selection:hr.language,name:0 | ||
552 | 335 | msgid "French / Français" | ||
553 | 336 | msgstr "" | ||
554 | 337 | |||
555 | 338 | #. module: hr_language | ||
556 | 339 | #: selection:hr.language,name:0 | ||
557 | 340 | msgid "Greek / Ελληνικά" | ||
558 | 341 | msgstr "" | ||
559 | 342 | |||
560 | 343 | #. module: hr_language | ||
561 | 344 | #: selection:hr.language,name:0 | ||
562 | 345 | msgid "Estonian / Eesti keel" | ||
563 | 346 | msgstr "" | ||
564 | 347 | |||
565 | 348 | #. module: hr_language | ||
566 | 349 | #: selection:hr.language,name:0 | ||
567 | 350 | msgid "Turkish / Türkçe" | ||
568 | 351 | msgstr "" | ||
569 | 352 | |||
570 | 353 | #. module: hr_language | ||
571 | 354 | #: selection:hr.language,name:0 | ||
572 | 355 | msgid "Spanish (SV) / Español (SV)" | ||
573 | 356 | msgstr "" | ||
574 | 357 | |||
575 | 358 | #. module: hr_language | ||
576 | 359 | #: selection:hr.language,name:0 | ||
577 | 360 | msgid "Serbian (Latin) / srpski" | ||
578 | 361 | msgstr "" | ||
579 | 362 | |||
580 | 363 | #. module: hr_language | ||
581 | 364 | #: field:hr.language,description:0 | ||
582 | 365 | msgid "Description" | ||
583 | 366 | msgstr "" | ||
584 | 367 | |||
585 | 368 | #. module: hr_language | ||
586 | 369 | #: selection:hr.language,name:0 | ||
587 | 370 | msgid "Spanish (CR) / Español (CR)" | ||
588 | 371 | msgstr "" | ||
589 | 372 | |||
590 | 373 | #. module: hr_language | ||
591 | 374 | #: field:hr.language,read:0 | ||
592 | 375 | msgid "Read" | ||
593 | 376 | msgstr "" | ||
594 | 377 | |||
595 | 378 | #. module: hr_language | ||
596 | 379 | #: selection:hr.language,name:0 | ||
597 | 380 | msgid "English (US)" | ||
598 | 381 | msgstr "" | ||
599 | 382 | |||
600 | 383 | #. module: hr_language | ||
601 | 384 | #: selection:hr.language,name:0 | ||
602 | 385 | msgid "Occitan (FR, post 1500) / Occitan" | ||
603 | 386 | msgstr "" | ||
604 | 387 | |||
605 | 388 | #. module: hr_language | ||
606 | 389 | #: selection:hr.language,name:0 | ||
607 | 390 | msgid "Spanish (HN) / Español (HN)" | ||
608 | 391 | msgstr "" | ||
609 | 392 | |||
610 | 393 | #. module: hr_language | ||
611 | 394 | #: selection:hr.language,name:0 | ||
612 | 395 | msgid "Hindi / हिंदी" | ||
613 | 396 | msgstr "" | ||
614 | 397 | |||
615 | 398 | #. module: hr_language | ||
616 | 399 | #: selection:hr.language,name:0 | ||
617 | 400 | msgid "Mongolian / монгол" | ||
618 | 401 | msgstr "" | ||
619 | 402 | |||
620 | 403 | #. module: hr_language | ||
621 | 404 | #: selection:hr.language,name:0 | ||
622 | 405 | msgid "Spanish (NI) / Español (NI)" | ||
623 | 406 | msgstr "" | ||
624 | 407 | |||
625 | 408 | #. module: hr_language | ||
626 | 409 | #: selection:hr.language,name:0 | ||
627 | 410 | msgid "Malayalam / മലയാളം" | ||
628 | 411 | msgstr "" | ||
629 | 412 | |||
630 | 413 | #. module: hr_language | ||
631 | 414 | #: selection:hr.language,name:0 | ||
632 | 415 | msgid "French (BE) / Français (BE)" | ||
633 | 416 | msgstr "" | ||
634 | 417 | |||
635 | 418 | #. module: hr_language | ||
636 | 419 | #: selection:hr.language,name:0 | ||
637 | 420 | msgid "Thai / ภาษาไทย" | ||
638 | 421 | msgstr "" | ||
639 | 422 | |||
640 | 423 | #. module: hr_language | ||
641 | 424 | #: selection:hr.language,name:0 | ||
642 | 425 | msgid "Slovenian / slovenščina" | ||
643 | 426 | msgstr "" | ||
644 | 427 | |||
645 | 428 | #. module: hr_language | ||
646 | 429 | #: selection:hr.language,name:0 | ||
647 | 430 | msgid "Persian / فارس" | ||
648 | 431 | msgstr "" | ||
649 | 432 | |||
650 | 433 | #. module: hr_language | ||
651 | 434 | #: selection:hr.language,name:0 | ||
652 | 435 | msgid "Polish / Język polski" | ||
653 | 436 | msgstr "" | ||
654 | 437 | |||
655 | 438 | #. module: hr_language | ||
656 | 439 | #: selection:hr.language,name:0 | ||
657 | 440 | msgid "Swedish / svenska" | ||
658 | 441 | msgstr "" | ||
659 | 442 | |||
660 | 443 | #. module: hr_language | ||
661 | 444 | #: selection:hr.language,name:0 | ||
662 | 445 | msgid "Chinese (CN) / 简体中文" | ||
663 | 446 | msgstr "" | ||
664 | 447 | |||
665 | 448 | #. module: hr_language | ||
666 | 449 | #: selection:hr.language,name:0 | ||
667 | 450 | msgid "English (UK)" | ||
668 | 451 | msgstr "" | ||
669 | 452 | |||
670 | 453 | #. module: hr_language | ||
671 | 454 | #: selection:hr.language,name:0 | ||
672 | 455 | msgid "Japanese / 日本語" | ||
673 | 456 | msgstr "" | ||
674 | 457 | |||
675 | 458 | #. module: hr_language | ||
676 | 459 | #: selection:hr.language,name:0 | ||
677 | 460 | msgid "Russian / русский язык" | ||
678 | 461 | msgstr "" | ||
679 | 462 | |||
680 | 0 | 463 | ||
681 | === added directory 'hr_language/security' | |||
682 | === added file 'hr_language/security/ir.model.access.csv' | |||
683 | --- hr_language/security/ir.model.access.csv 1970-01-01 00:00:00 +0000 | |||
684 | +++ hr_language/security/ir.model.access.csv 2013-12-31 21:40:09 +0000 | |||
685 | @@ -0,0 +1,2 @@ | |||
686 | 1 | "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" | ||
687 | 2 | "access_hr_language","hr.language","model_hr_language",base.group_hr_user,1,1,1,1 |
Hi El Hadji,
Thanks again for your contribution. I just did a review for your other merge proposal (https:/ /code.launchpad .net/~savoirfai relinux- openerp/ openerp- hr/experience/ +merge/ 194926) and the same points apply.
l.98.101. 117.120. 125