Merge lp:~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr into lp:~openobject-italia-core-devs/openobject-italia/italian-addons
- adding_l10n_it_hr
- Merge into italian-addons
Proposed by
Lorenzo Battistini
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 113 | ||||
Proposed branch: | lp:~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr | ||||
Merge into: | lp:~openobject-italia-core-devs/openobject-italia/italian-addons | ||||
Diff against target: |
654 lines (+286/-150) 14 files modified
l10n_it_hr/AUTHORS.txt (+2/-0) l10n_it_hr/__init__.py (+23/-0) l10n_it_hr/__openerp__.py (+47/-0) l10n_it_hr/employee.py (+31/-0) l10n_it_hr/employee_view.xml (+17/-0) l10n_it_hr/i18n/it.po (+64/-0) l10n_it_hr/i18n/l10n_it_hr.pot (+58/-0) l10n_it_sale/__init__.py (+0/-1) l10n_it_sale/__openerp__.py (+2/-4) l10n_it_sale/hr/__init__.py (+0/-23) l10n_it_sale/hr/employee.py (+0/-10) l10n_it_sale/hr/employee_view.xml (+0/-17) l10n_it_sale/i18n/it.po (+25/-52) l10n_it_sale/i18n/l10n_it_sale.pot (+17/-43) |
||||
To merge this branch: | bzr merge lp:~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Italia core devs | Pending | ||
Review via email: mp+60830@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 108. By Lorenzo Battistini
-
[FIX] copyright
- 109. By Lorenzo Battistini
-
[MERGE]
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'l10n_it_hr' | |||
2 | === added file 'l10n_it_hr/AUTHORS.txt' | |||
3 | --- l10n_it_hr/AUTHORS.txt 1970-01-01 00:00:00 +0000 | |||
4 | +++ l10n_it_hr/AUTHORS.txt 2011-07-02 09:56:31 +0000 | |||
5 | @@ -0,0 +1,2 @@ | |||
6 | 1 | Lorenzo Battistini <lorenzo.battistini@domsense.com> | ||
7 | 2 | |||
8 | 0 | 3 | ||
9 | === added file 'l10n_it_hr/__init__.py' | |||
10 | --- l10n_it_hr/__init__.py 1970-01-01 00:00:00 +0000 | |||
11 | +++ l10n_it_hr/__init__.py 2011-07-02 09:56:31 +0000 | |||
12 | @@ -0,0 +1,23 @@ | |||
13 | 1 | # -*- encoding: utf-8 -*- | ||
14 | 2 | ############################################################################## | ||
15 | 3 | # | ||
16 | 4 | # Copyright (C) 2010-2011 Associazione OpenERP Italia | ||
17 | 5 | # (<http://www.openerp-italia.org>). | ||
18 | 6 | # All Rights Reserved | ||
19 | 7 | # | ||
20 | 8 | # This program is free software: you can redistribute it and/or modify | ||
21 | 9 | # it under the terms of the GNU Affero General Public License as published | ||
22 | 10 | # by the Free Software Foundation, either version 3 of the License, or | ||
23 | 11 | # (at your option) any later version. | ||
24 | 12 | # | ||
25 | 13 | # This program is distributed in the hope that it will be useful, | ||
26 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
27 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
28 | 16 | # GNU General Public License for more details. | ||
29 | 17 | # | ||
30 | 18 | # You should have received a copy of the GNU Affero General Public License | ||
31 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
32 | 20 | # | ||
33 | 21 | ############################################################################## | ||
34 | 22 | |||
35 | 23 | import employee | ||
36 | 0 | 24 | ||
37 | === added file 'l10n_it_hr/__openerp__.py' | |||
38 | --- l10n_it_hr/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
39 | +++ l10n_it_hr/__openerp__.py 2011-07-02 09:56:31 +0000 | |||
40 | @@ -0,0 +1,47 @@ | |||
41 | 1 | # -*- encoding: utf-8 -*- | ||
42 | 2 | ############################################################################## | ||
43 | 3 | # | ||
44 | 4 | # Copyright (C) 2010-2011 Associazione OpenERP Italia | ||
45 | 5 | # (<http://www.openerp-italia.org>). | ||
46 | 6 | # All Rights Reserved | ||
47 | 7 | # | ||
48 | 8 | # This program is free software: you can redistribute it and/or modify | ||
49 | 9 | # it under the terms of the GNU Affero General Public License as published | ||
50 | 10 | # by the Free Software Foundation, either version 3 of the License, or | ||
51 | 11 | # (at your option) any later version. | ||
52 | 12 | # | ||
53 | 13 | # This program is distributed in the hope that it will be useful, | ||
54 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
55 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
56 | 16 | # GNU General Public License for more details. | ||
57 | 17 | # | ||
58 | 18 | # You should have received a copy of the GNU Affero General Public License | ||
59 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
60 | 20 | # | ||
61 | 21 | ############################################################################## | ||
62 | 22 | { | ||
63 | 23 | 'name': 'Italian Localisation - HR', | ||
64 | 24 | 'version': '0.2', | ||
65 | 25 | 'category': 'Localisation/Italy', | ||
66 | 26 | 'description': """OpenERP Italian Localization - HR version | ||
67 | 27 | |||
68 | 28 | Functionalities: | ||
69 | 29 | |||
70 | 30 | - Fiscal Code for employee | ||
71 | 31 | |||
72 | 32 | """, | ||
73 | 33 | 'author': 'OpenERP Italian Community', | ||
74 | 34 | 'website': 'http://www.openerp-italia.org', | ||
75 | 35 | 'license': 'AGPL-3', | ||
76 | 36 | "depends" : ['hr'], | ||
77 | 37 | "init_xml" : [ | ||
78 | 38 | ], | ||
79 | 39 | "update_xml" : [ | ||
80 | 40 | 'employee_view.xml', | ||
81 | 41 | ], | ||
82 | 42 | "demo_xml" : [], | ||
83 | 43 | "active": False, | ||
84 | 44 | "installable": True | ||
85 | 45 | } | ||
86 | 46 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | ||
87 | 47 | |||
88 | 0 | 48 | ||
89 | === added file 'l10n_it_hr/employee.py' | |||
90 | --- l10n_it_hr/employee.py 1970-01-01 00:00:00 +0000 | |||
91 | +++ l10n_it_hr/employee.py 2011-07-02 09:56:31 +0000 | |||
92 | @@ -0,0 +1,31 @@ | |||
93 | 1 | # -*- encoding: utf-8 -*- | ||
94 | 2 | ############################################################################## | ||
95 | 3 | # | ||
96 | 4 | # Copyright (C) 2010-2011 Associazione OpenERP Italia | ||
97 | 5 | # (<http://www.openerp-italia.org>). | ||
98 | 6 | # All Rights Reserved | ||
99 | 7 | # | ||
100 | 8 | # This program is free software: you can redistribute it and/or modify | ||
101 | 9 | # it under the terms of the GNU Affero General Public License as published | ||
102 | 10 | # by the Free Software Foundation, either version 3 of the License, or | ||
103 | 11 | # (at your option) any later version. | ||
104 | 12 | # | ||
105 | 13 | # This program is distributed in the hope that it will be useful, | ||
106 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
107 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
108 | 16 | # GNU General Public License for more details. | ||
109 | 17 | # | ||
110 | 18 | # You should have received a copy of the GNU Affero General Public License | ||
111 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
112 | 20 | # | ||
113 | 21 | ############################################################################## | ||
114 | 22 | |||
115 | 23 | from osv import osv | ||
116 | 24 | from osv import fields | ||
117 | 25 | |||
118 | 26 | class hr_employee(osv.osv): | ||
119 | 27 | _inherit = 'hr.employee' | ||
120 | 28 | _columns = { | ||
121 | 29 | 'fiscalcode': fields.char('Fiscal Code', size=16, help="Italian Fiscal Code"), | ||
122 | 30 | } | ||
123 | 31 | hr_employee() | ||
124 | 0 | 32 | ||
125 | === added file 'l10n_it_hr/employee_view.xml' | |||
126 | --- l10n_it_hr/employee_view.xml 1970-01-01 00:00:00 +0000 | |||
127 | +++ l10n_it_hr/employee_view.xml 2011-07-02 09:56:31 +0000 | |||
128 | @@ -0,0 +1,17 @@ | |||
129 | 1 | <?xml version="1.0" ?> | ||
130 | 2 | <openerp> | ||
131 | 3 | <data> | ||
132 | 4 | |||
133 | 5 | <record id="view_employee_form_fiscalcode" model="ir.ui.view"> | ||
134 | 6 | <field name="name">hr.employee.form.fiscalcode</field> | ||
135 | 7 | <field name="model">hr.employee</field> | ||
136 | 8 | <field name="inherit_id" ref="hr.view_employee_form"/> | ||
137 | 9 | <field name="arch" type="xml"> | ||
138 | 10 | <field name="passport_id" position="after"> | ||
139 | 11 | <field name="fiscalcode"/> | ||
140 | 12 | </field> | ||
141 | 13 | </field> | ||
142 | 14 | </record> | ||
143 | 15 | |||
144 | 16 | </data> | ||
145 | 17 | </openerp> | ||
146 | 0 | 18 | ||
147 | === added directory 'l10n_it_hr/i18n' | |||
148 | === added file 'l10n_it_hr/i18n/it.po' | |||
149 | --- l10n_it_hr/i18n/it.po 1970-01-01 00:00:00 +0000 | |||
150 | +++ l10n_it_hr/i18n/it.po 2011-07-02 09:56:31 +0000 | |||
151 | @@ -0,0 +1,64 @@ | |||
152 | 1 | # Translation of OpenERP Server. | ||
153 | 2 | # This file contains the translation of the following modules: | ||
154 | 3 | # * l10n_it_hr | ||
155 | 4 | # | ||
156 | 5 | msgid "" | ||
157 | 6 | msgstr "" | ||
158 | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" | ||
159 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | ||
160 | 9 | "POT-Creation-Date: 2011-05-12 20:06+0000\n" | ||
161 | 10 | "PO-Revision-Date: 2011-05-12 22:07+0100\n" | ||
162 | 11 | "Last-Translator: Lorenzo Battistini <lorenzo.battistini@agilebg.com>\n" | ||
163 | 12 | "Language-Team: \n" | ||
164 | 13 | "MIME-Version: 1.0\n" | ||
165 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
166 | 15 | "Content-Transfer-Encoding: 8bit\n" | ||
167 | 16 | "Plural-Forms: \n" | ||
168 | 17 | |||
169 | 18 | #. module: l10n_it_hr | ||
170 | 19 | #: model:ir.module.module,description:l10n_it_hr.module_meta_information | ||
171 | 20 | msgid "" | ||
172 | 21 | "OpenERP Italian Localization - HR version\n" | ||
173 | 22 | "\n" | ||
174 | 23 | "Functionalities:\n" | ||
175 | 24 | "\n" | ||
176 | 25 | "- Fiscal Code for employee\n" | ||
177 | 26 | "\n" | ||
178 | 27 | msgstr "" | ||
179 | 28 | "Localizzazione Italiana - Versione Risorse Umane\n" | ||
180 | 29 | "\n" | ||
181 | 30 | "Funzionalità:\n" | ||
182 | 31 | "\n" | ||
183 | 32 | "- Codice fiscale per i dipendenti\n" | ||
184 | 33 | "\n" | ||
185 | 34 | |||
186 | 35 | #. module: l10n_it_hr | ||
187 | 36 | #: model:ir.module.module,shortdesc:l10n_it_hr.module_meta_information | ||
188 | 37 | msgid "Italian Localisation - Sale" | ||
189 | 38 | msgstr "Localizzazione Italiana - Vendite" | ||
190 | 39 | |||
191 | 40 | #. module: l10n_it_hr | ||
192 | 41 | #: constraint:hr.employee:0 | ||
193 | 42 | msgid "Error ! You cannot select a department for which the employee is the manager." | ||
194 | 43 | msgstr "Errore ! Non è possibile selezionare un dipartimento di cui il dipendente è manager." | ||
195 | 44 | |||
196 | 45 | #. module: l10n_it_hr | ||
197 | 46 | #: help:hr.employee,fiscalcode:0 | ||
198 | 47 | msgid "Italian Fiscal Code" | ||
199 | 48 | msgstr "Codice fiscale italiano" | ||
200 | 49 | |||
201 | 50 | #. module: l10n_it_hr | ||
202 | 51 | #: field:hr.employee,fiscalcode:0 | ||
203 | 52 | msgid "Fiscal Code" | ||
204 | 53 | msgstr "Codice fiscale" | ||
205 | 54 | |||
206 | 55 | #. module: l10n_it_hr | ||
207 | 56 | #: model:ir.model,name:l10n_it_hr.model_hr_employee | ||
208 | 57 | msgid "Employee" | ||
209 | 58 | msgstr "Dipendente" | ||
210 | 59 | |||
211 | 60 | #. module: l10n_it_hr | ||
212 | 61 | #: constraint:hr.employee:0 | ||
213 | 62 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
214 | 63 | msgstr "Errore ! Non è possibile creare una gerarchia ricorsiva di dipendenti" | ||
215 | 64 | |||
216 | 0 | 65 | ||
217 | === added file 'l10n_it_hr/i18n/l10n_it_hr.pot' | |||
218 | --- l10n_it_hr/i18n/l10n_it_hr.pot 1970-01-01 00:00:00 +0000 | |||
219 | +++ l10n_it_hr/i18n/l10n_it_hr.pot 2011-07-02 09:56:31 +0000 | |||
220 | @@ -0,0 +1,58 @@ | |||
221 | 1 | # Translation of OpenERP Server. | ||
222 | 2 | # This file contains the translation of the following modules: | ||
223 | 3 | # * l10n_it_hr | ||
224 | 4 | # | ||
225 | 5 | msgid "" | ||
226 | 6 | msgstr "" | ||
227 | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" | ||
228 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | ||
229 | 9 | "POT-Creation-Date: 2011-05-12 20:05+0000\n" | ||
230 | 10 | "PO-Revision-Date: 2011-05-12 20:05+0000\n" | ||
231 | 11 | "Last-Translator: <>\n" | ||
232 | 12 | "Language-Team: \n" | ||
233 | 13 | "MIME-Version: 1.0\n" | ||
234 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
235 | 15 | "Content-Transfer-Encoding: \n" | ||
236 | 16 | "Plural-Forms: \n" | ||
237 | 17 | |||
238 | 18 | #. module: l10n_it_hr | ||
239 | 19 | #: model:ir.module.module,description:l10n_it_hr.module_meta_information | ||
240 | 20 | msgid "OpenERP Italian Localization - HR version\n" | ||
241 | 21 | "\n" | ||
242 | 22 | "Functionalities:\n" | ||
243 | 23 | "\n" | ||
244 | 24 | "- Fiscal Code for employee\n" | ||
245 | 25 | "\n" | ||
246 | 26 | "" | ||
247 | 27 | msgstr "" | ||
248 | 28 | |||
249 | 29 | #. module: l10n_it_hr | ||
250 | 30 | #: model:ir.module.module,shortdesc:l10n_it_hr.module_meta_information | ||
251 | 31 | msgid "Italian Localisation - Sale" | ||
252 | 32 | msgstr "" | ||
253 | 33 | |||
254 | 34 | #. module: l10n_it_hr | ||
255 | 35 | #: constraint:hr.employee:0 | ||
256 | 36 | msgid "Error ! You cannot select a department for which the employee is the manager." | ||
257 | 37 | msgstr "" | ||
258 | 38 | |||
259 | 39 | #. module: l10n_it_hr | ||
260 | 40 | #: help:hr.employee,fiscalcode:0 | ||
261 | 41 | msgid "Italian Fiscal Code" | ||
262 | 42 | msgstr "" | ||
263 | 43 | |||
264 | 44 | #. module: l10n_it_hr | ||
265 | 45 | #: field:hr.employee,fiscalcode:0 | ||
266 | 46 | msgid "Fiscal Code" | ||
267 | 47 | msgstr "" | ||
268 | 48 | |||
269 | 49 | #. module: l10n_it_hr | ||
270 | 50 | #: model:ir.model,name:l10n_it_hr.model_hr_employee | ||
271 | 51 | msgid "Employee" | ||
272 | 52 | msgstr "" | ||
273 | 53 | |||
274 | 54 | #. module: l10n_it_hr | ||
275 | 55 | #: constraint:hr.employee:0 | ||
276 | 56 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
277 | 57 | msgstr "" | ||
278 | 58 | |||
279 | 0 | 59 | ||
280 | === modified file 'l10n_it_sale/__init__.py' | |||
281 | --- l10n_it_sale/__init__.py 2011-05-06 13:07:22 +0000 | |||
282 | +++ l10n_it_sale/__init__.py 2011-07-02 09:56:31 +0000 | |||
283 | @@ -22,7 +22,6 @@ | |||
284 | 22 | 22 | ||
285 | 23 | import sale | 23 | import sale |
286 | 24 | import stock | 24 | import stock |
287 | 25 | import hr | ||
288 | 26 | import account | 25 | import account |
289 | 27 | import partner | 26 | import partner |
290 | 28 | import wizard | 27 | import wizard |
291 | 29 | 28 | ||
292 | === modified file 'l10n_it_sale/__openerp__.py' | |||
293 | --- l10n_it_sale/__openerp__.py 2011-05-06 13:07:22 +0000 | |||
294 | +++ l10n_it_sale/__openerp__.py 2011-07-02 09:56:31 +0000 | |||
295 | @@ -23,18 +23,17 @@ | |||
296 | 23 | 'name': 'Italian Localisation - Sale', | 23 | 'name': 'Italian Localisation - Sale', |
297 | 24 | 'version': '0.2', | 24 | 'version': '0.2', |
298 | 25 | 'category': 'Localisation/Italy', | 25 | 'category': 'Localisation/Italy', |
300 | 26 | 'description': """This module customizes OpenERP in order to fit italian laws and mores - Sale version | 26 | 'description': """OpenERP Italian Localization - Sale version |
301 | 27 | 27 | ||
302 | 28 | Functionalities: | 28 | Functionalities: |
303 | 29 | 29 | ||
304 | 30 | - Documento di trasporto | 30 | - Documento di trasporto |
305 | 31 | - Fiscal Code for employee | ||
306 | 32 | 31 | ||
307 | 33 | """, | 32 | """, |
308 | 34 | 'author': 'OpenERP Italian Community', | 33 | 'author': 'OpenERP Italian Community', |
309 | 35 | 'website': 'http://www.openerp-italia.org', | 34 | 'website': 'http://www.openerp-italia.org', |
310 | 36 | 'license': 'AGPL-3', | 35 | 'license': 'AGPL-3', |
312 | 37 | "depends" : ['stock','sale','hr','account', 'delivery'], | 36 | "depends" : ['stock', 'sale', 'account', 'delivery'], |
313 | 38 | "init_xml" : [ | 37 | "init_xml" : [ |
314 | 39 | ], | 38 | ], |
315 | 40 | "update_xml" : [ | 39 | "update_xml" : [ |
316 | @@ -49,7 +48,6 @@ | |||
317 | 49 | 'stock/sequence.xml', | 48 | 'stock/sequence.xml', |
318 | 50 | 'sale/sale_view.xml', | 49 | 'sale/sale_view.xml', |
319 | 51 | "security/ir.model.access.csv", | 50 | "security/ir.model.access.csv", |
320 | 52 | 'hr/employee_view.xml', | ||
321 | 53 | 'partner/partner_view.xml', | 51 | 'partner/partner_view.xml', |
322 | 54 | 'account/invoice_view.xml', | 52 | 'account/invoice_view.xml', |
323 | 55 | ], | 53 | ], |
324 | 56 | 54 | ||
325 | === removed directory 'l10n_it_sale/hr' | |||
326 | === removed file 'l10n_it_sale/hr/__init__.py' | |||
327 | --- l10n_it_sale/hr/__init__.py 2010-11-17 08:04:13 +0000 | |||
328 | +++ l10n_it_sale/hr/__init__.py 1970-01-01 00:00:00 +0000 | |||
329 | @@ -1,23 +0,0 @@ | |||
330 | 1 | # -*- encoding: utf-8 -*- | ||
331 | 2 | ############################################################################## | ||
332 | 3 | # | ||
333 | 4 | # Copyright (C) 2010 OpenERP Italian Community (<http://www.openerp-italia.org>). | ||
334 | 5 | # All Rights Reserved | ||
335 | 6 | # $Id$ | ||
336 | 7 | # | ||
337 | 8 | # This program is free software: you can redistribute it and/or modify | ||
338 | 9 | # it under the terms of the GNU Affero General Public License as published by | ||
339 | 10 | # the Free Software Foundation, either version 3 of the License, or | ||
340 | 11 | # (at your option) any later version. | ||
341 | 12 | # | ||
342 | 13 | # This program is distributed in the hope that it will be useful, | ||
343 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
344 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
345 | 16 | # GNU General Public License for more details. | ||
346 | 17 | # | ||
347 | 18 | # You should have received a copy of the GNU General Public License | ||
348 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
349 | 20 | # | ||
350 | 21 | ############################################################################## | ||
351 | 22 | |||
352 | 23 | import employee | ||
353 | 24 | 0 | ||
354 | === removed file 'l10n_it_sale/hr/employee.py' | |||
355 | --- l10n_it_sale/hr/employee.py 2010-09-22 13:43:42 +0000 | |||
356 | +++ l10n_it_sale/hr/employee.py 1970-01-01 00:00:00 +0000 | |||
357 | @@ -1,10 +0,0 @@ | |||
358 | 1 | |||
359 | 2 | from osv import osv | ||
360 | 3 | from osv import fields | ||
361 | 4 | |||
362 | 5 | class hr_employee(osv.osv): | ||
363 | 6 | _inherit = 'hr.employee' | ||
364 | 7 | _columns = { | ||
365 | 8 | 'fiscalcode': fields.char('Fiscal Code', size=16, help="Italian Fiscal Code"), | ||
366 | 9 | } | ||
367 | 10 | hr_employee() | ||
368 | 11 | 0 | ||
369 | === removed file 'l10n_it_sale/hr/employee_view.xml' | |||
370 | --- l10n_it_sale/hr/employee_view.xml 2010-11-01 18:56:36 +0000 | |||
371 | +++ l10n_it_sale/hr/employee_view.xml 1970-01-01 00:00:00 +0000 | |||
372 | @@ -1,17 +0,0 @@ | |||
373 | 1 | <?xml version="1.0" ?> | ||
374 | 2 | <openerp> | ||
375 | 3 | <data> | ||
376 | 4 | |||
377 | 5 | <record id="view_employee_form_fiscalcode" model="ir.ui.view"> | ||
378 | 6 | <field name="name">hr.employee.form.fiscalcode</field> | ||
379 | 7 | <field name="model">hr.employee</field> | ||
380 | 8 | <field name="inherit_id" ref="hr.view_employee_form"/> | ||
381 | 9 | <field name="arch" type="xml"> | ||
382 | 10 | <field name="passport_id" position="after"> | ||
383 | 11 | <field name="fiscalcode"/> | ||
384 | 12 | </field> | ||
385 | 13 | </field> | ||
386 | 14 | </record> | ||
387 | 15 | |||
388 | 16 | </data> | ||
389 | 17 | </openerp> | ||
390 | 18 | 0 | ||
391 | === modified file 'l10n_it_sale/i18n/it.po' | |||
392 | --- l10n_it_sale/i18n/it.po 2011-05-06 13:54:43 +0000 | |||
393 | +++ l10n_it_sale/i18n/it.po 2011-07-02 09:56:31 +0000 | |||
394 | @@ -6,9 +6,9 @@ | |||
395 | 6 | msgstr "" | 6 | msgstr "" |
396 | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" |
397 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
401 | 9 | "POT-Creation-Date: 2011-05-06 13:50+0000\n" | 9 | "POT-Creation-Date: 2011-05-12 20:12+0000\n" |
402 | 10 | "PO-Revision-Date: 2011-05-06 15:54+0100\n" | 10 | "PO-Revision-Date: 2011-05-12 22:18+0100\n" |
403 | 11 | "Last-Translator: eLBati <lorenzo.battistini@domsense.com>\n" | 11 | "Last-Translator: Lorenzo Battistini <lorenzo.battistini@agilebg.com>\n" |
404 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
405 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
406 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 14 | "Content-Type: text/plain; charset=UTF-8\n" |
407 | @@ -23,25 +23,6 @@ | |||
408 | 23 | msgstr "Aspetto dei Beni" | 23 | msgstr "Aspetto dei Beni" |
409 | 24 | 24 | ||
410 | 25 | #. module: l10n_it_sale | 25 | #. module: l10n_it_sale |
411 | 26 | #: model:ir.module.module,description:l10n_it_sale.module_meta_information | ||
412 | 27 | msgid "" | ||
413 | 28 | "This module customizes OpenERP in order to fit italian laws and mores - Sale version\n" | ||
414 | 29 | "\n" | ||
415 | 30 | "Functionalities:\n" | ||
416 | 31 | "\n" | ||
417 | 32 | "- Documento di trasporto\n" | ||
418 | 33 | "- Fiscal Code for employee\n" | ||
419 | 34 | "\n" | ||
420 | 35 | msgstr "" | ||
421 | 36 | "Localizzazione Italiana - Versione Sale\n" | ||
422 | 37 | "\n" | ||
423 | 38 | "Funzionalità:\n" | ||
424 | 39 | "\n" | ||
425 | 40 | "- Documento di trasporto\n" | ||
426 | 41 | "- Codice fiscale per l'impiegato\n" | ||
427 | 42 | "\n" | ||
428 | 43 | |||
429 | 44 | #. module: l10n_it_sale | ||
430 | 45 | #: field:stock.picking.carriage_condition,note:0 | 26 | #: field:stock.picking.carriage_condition,note:0 |
431 | 46 | #: field:stock.picking.goods_description,note:0 | 27 | #: field:stock.picking.goods_description,note:0 |
432 | 47 | #: field:stock.picking.transportation_reason,note:0 | 28 | #: field:stock.picking.transportation_reason,note:0 |
433 | @@ -49,9 +30,11 @@ | |||
434 | 49 | msgstr "Note" | 30 | msgstr "Note" |
435 | 50 | 31 | ||
436 | 51 | #. module: l10n_it_sale | 32 | #. module: l10n_it_sale |
440 | 52 | #: field:hr.employee,fiscalcode:0 | 33 | #: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree |
441 | 53 | msgid "Fiscal Code" | 34 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree |
442 | 54 | msgstr "Codice fiscale" | 35 | #: view:stock.picking.transportation_reason:0 |
443 | 36 | msgid "Reasons for transportation" | ||
444 | 37 | msgstr "Causale del trasporto" | ||
445 | 55 | 38 | ||
446 | 56 | #. module: l10n_it_sale | 39 | #. module: l10n_it_sale |
447 | 57 | #: model:ir.model,name:l10n_it_sale.model_stock_picking | 40 | #: model:ir.model,name:l10n_it_sale.model_stock_picking |
448 | @@ -59,11 +42,6 @@ | |||
449 | 59 | msgstr "Picking List" | 42 | msgstr "Picking List" |
450 | 60 | 43 | ||
451 | 61 | #. module: l10n_it_sale | 44 | #. module: l10n_it_sale |
452 | 62 | #: model:ir.model,name:l10n_it_sale.model_hr_employee | ||
453 | 63 | msgid "Employee" | ||
454 | 64 | msgstr "Dipendente" | ||
455 | 65 | |||
456 | 66 | #. module: l10n_it_sale | ||
457 | 67 | #: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt | 45 | #: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt |
458 | 68 | #: view:stock.picking:0 | 46 | #: view:stock.picking:0 |
459 | 69 | #: view:wizard.assign.ddt:0 | 47 | #: view:wizard.assign.ddt:0 |
460 | @@ -86,11 +64,6 @@ | |||
461 | 86 | msgstr "Validità" | 64 | msgstr "Validità" |
462 | 87 | 65 | ||
463 | 88 | #. module: l10n_it_sale | 66 | #. module: l10n_it_sale |
464 | 89 | #: constraint:hr.employee:0 | ||
465 | 90 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
466 | 91 | msgstr "Errore ! Non è possibile creare una gerarchia ricorsiva di dipendenti" | ||
467 | 92 | |||
468 | 93 | #. module: l10n_it_sale | ||
469 | 94 | #: model:ir.model,name:l10n_it_sale.model_wizard_assign_ddt | 67 | #: model:ir.model,name:l10n_it_sale.model_wizard_assign_ddt |
470 | 95 | msgid "wizard.assign.ddt" | 68 | msgid "wizard.assign.ddt" |
471 | 96 | msgstr "wizard.assign.ddt" | 69 | msgstr "wizard.assign.ddt" |
472 | @@ -101,11 +74,6 @@ | |||
473 | 101 | msgstr "Note" | 74 | msgstr "Note" |
474 | 102 | 75 | ||
475 | 103 | #. module: l10n_it_sale | 76 | #. module: l10n_it_sale |
476 | 104 | #: constraint:hr.employee:0 | ||
477 | 105 | msgid "Error ! You cannot select a department for which the employee is the manager." | ||
478 | 106 | msgstr "Errore ! Non è possibile selezionare un dipartimento di cui il dipendente è manager." | ||
479 | 107 | |||
480 | 108 | #. module: l10n_it_sale | ||
481 | 109 | #: view:account.invoice:0 | 77 | #: view:account.invoice:0 |
482 | 110 | msgid "Shipping" | 78 | msgid "Shipping" |
483 | 111 | msgstr "Trasporto" | 79 | msgstr "Trasporto" |
484 | @@ -177,13 +145,6 @@ | |||
485 | 177 | msgstr "Aspetto dei Beni" | 145 | msgstr "Aspetto dei Beni" |
486 | 178 | 146 | ||
487 | 179 | #. module: l10n_it_sale | 147 | #. module: l10n_it_sale |
488 | 180 | #: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree | ||
489 | 181 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree | ||
490 | 182 | #: view:stock.picking.transportation_reason:0 | ||
491 | 183 | msgid "Reasons for transportation" | ||
492 | 184 | msgstr "Causale del trasporto" | ||
493 | 185 | |||
494 | 186 | #. module: l10n_it_sale | ||
495 | 187 | #: model:ir.actions.act_window,name:l10n_it_sale.action_carriage_condition_tree | 148 | #: model:ir.actions.act_window,name:l10n_it_sale.action_carriage_condition_tree |
496 | 188 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_carriage_condition_tree | 149 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_carriage_condition_tree |
497 | 189 | #: view:stock.picking.carriage_condition:0 | 150 | #: view:stock.picking.carriage_condition:0 |
498 | @@ -191,11 +152,6 @@ | |||
499 | 191 | msgstr "Resa merce" | 152 | msgstr "Resa merce" |
500 | 192 | 153 | ||
501 | 193 | #. module: l10n_it_sale | 154 | #. module: l10n_it_sale |
502 | 194 | #: help:hr.employee,fiscalcode:0 | ||
503 | 195 | msgid "Italian Fiscal Code" | ||
504 | 196 | msgstr "Codice fiscale italiano" | ||
505 | 197 | |||
506 | 198 | #. module: l10n_it_sale | ||
507 | 199 | #: model:ir.model,name:l10n_it_sale.model_account_invoice | 155 | #: model:ir.model,name:l10n_it_sale.model_account_invoice |
508 | 200 | msgid "Invoice" | 156 | msgid "Invoice" |
509 | 201 | msgstr "Fattura" | 157 | msgstr "Fattura" |
510 | @@ -227,3 +183,20 @@ | |||
511 | 227 | msgid "Default shipping conditions" | 183 | msgid "Default shipping conditions" |
512 | 228 | msgstr "Dati DDT" | 184 | msgstr "Dati DDT" |
513 | 229 | 185 | ||
514 | 186 | #. module: l10n_it_sale | ||
515 | 187 | #: model:ir.module.module,description:l10n_it_sale.module_meta_information | ||
516 | 188 | msgid "" | ||
517 | 189 | "OpenERP Italian Localization - Sale version\n" | ||
518 | 190 | "\n" | ||
519 | 191 | "Functionalities:\n" | ||
520 | 192 | "\n" | ||
521 | 193 | "- Documento di trasporto\n" | ||
522 | 194 | "\n" | ||
523 | 195 | msgstr "" | ||
524 | 196 | "Localizzazione Italiana - Versione Sale\n" | ||
525 | 197 | "\n" | ||
526 | 198 | "Funzionalità:\n" | ||
527 | 199 | "\n" | ||
528 | 200 | "- Documento di trasporto\n" | ||
529 | 201 | "\n" | ||
530 | 202 | |||
531 | 230 | 203 | ||
532 | === modified file 'l10n_it_sale/i18n/l10n_it_sale.pot' | |||
533 | --- l10n_it_sale/i18n/l10n_it_sale.pot 2011-05-06 13:54:43 +0000 | |||
534 | +++ l10n_it_sale/i18n/l10n_it_sale.pot 2011-07-02 09:56:31 +0000 | |||
535 | @@ -6,8 +6,8 @@ | |||
536 | 6 | msgstr "" | 6 | msgstr "" |
537 | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" |
538 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
541 | 9 | "POT-Creation-Date: 2011-05-06 13:37+0000\n" | 9 | "POT-Creation-Date: 2011-05-12 20:12+0000\n" |
542 | 10 | "PO-Revision-Date: 2011-05-06 13:37+0000\n" | 10 | "PO-Revision-Date: 2011-05-12 20:12+0000\n" |
543 | 11 | "Last-Translator: <>\n" | 11 | "Last-Translator: <>\n" |
544 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
545 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
546 | @@ -23,18 +23,6 @@ | |||
547 | 23 | msgstr "" | 23 | msgstr "" |
548 | 24 | 24 | ||
549 | 25 | #. module: l10n_it_sale | 25 | #. module: l10n_it_sale |
550 | 26 | #: model:ir.module.module,description:l10n_it_sale.module_meta_information | ||
551 | 27 | msgid "This module customizes OpenERP in order to fit italian laws and mores - Sale version\n" | ||
552 | 28 | "\n" | ||
553 | 29 | "Functionalities:\n" | ||
554 | 30 | "\n" | ||
555 | 31 | "- Documento di trasporto\n" | ||
556 | 32 | "- Fiscal Code for employee\n" | ||
557 | 33 | "\n" | ||
558 | 34 | "" | ||
559 | 35 | msgstr "" | ||
560 | 36 | |||
561 | 37 | #. module: l10n_it_sale | ||
562 | 38 | #: field:stock.picking.carriage_condition,note:0 | 26 | #: field:stock.picking.carriage_condition,note:0 |
563 | 39 | #: field:stock.picking.goods_description,note:0 | 27 | #: field:stock.picking.goods_description,note:0 |
564 | 40 | #: field:stock.picking.transportation_reason,note:0 | 28 | #: field:stock.picking.transportation_reason,note:0 |
565 | @@ -42,8 +30,10 @@ | |||
566 | 42 | msgstr "" | 30 | msgstr "" |
567 | 43 | 31 | ||
568 | 44 | #. module: l10n_it_sale | 32 | #. module: l10n_it_sale |
571 | 45 | #: field:hr.employee,fiscalcode:0 | 33 | #: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree |
572 | 46 | msgid "Fiscal Code" | 34 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree |
573 | 35 | #: view:stock.picking.transportation_reason:0 | ||
574 | 36 | msgid "Reasons for transportation" | ||
575 | 47 | msgstr "" | 37 | msgstr "" |
576 | 48 | 38 | ||
577 | 49 | #. module: l10n_it_sale | 39 | #. module: l10n_it_sale |
578 | @@ -52,11 +42,6 @@ | |||
579 | 52 | msgstr "" | 42 | msgstr "" |
580 | 53 | 43 | ||
581 | 54 | #. module: l10n_it_sale | 44 | #. module: l10n_it_sale |
582 | 55 | #: model:ir.model,name:l10n_it_sale.model_hr_employee | ||
583 | 56 | msgid "Employee" | ||
584 | 57 | msgstr "" | ||
585 | 58 | |||
586 | 59 | #. module: l10n_it_sale | ||
587 | 60 | #: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt | 45 | #: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt |
588 | 61 | #: view:stock.picking:0 | 46 | #: view:stock.picking:0 |
589 | 62 | #: view:wizard.assign.ddt:0 | 47 | #: view:wizard.assign.ddt:0 |
590 | @@ -79,11 +64,6 @@ | |||
591 | 79 | msgstr "" | 64 | msgstr "" |
592 | 80 | 65 | ||
593 | 81 | #. module: l10n_it_sale | 66 | #. module: l10n_it_sale |
594 | 82 | #: constraint:hr.employee:0 | ||
595 | 83 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
596 | 84 | msgstr "" | ||
597 | 85 | |||
598 | 86 | #. module: l10n_it_sale | ||
599 | 87 | #: model:ir.model,name:l10n_it_sale.model_wizard_assign_ddt | 67 | #: model:ir.model,name:l10n_it_sale.model_wizard_assign_ddt |
600 | 88 | msgid "wizard.assign.ddt" | 68 | msgid "wizard.assign.ddt" |
601 | 89 | msgstr "" | 69 | msgstr "" |
602 | @@ -94,11 +74,6 @@ | |||
603 | 94 | msgstr "" | 74 | msgstr "" |
604 | 95 | 75 | ||
605 | 96 | #. module: l10n_it_sale | 76 | #. module: l10n_it_sale |
606 | 97 | #: constraint:hr.employee:0 | ||
607 | 98 | msgid "Error ! You cannot select a department for which the employee is the manager." | ||
608 | 99 | msgstr "" | ||
609 | 100 | |||
610 | 101 | #. module: l10n_it_sale | ||
611 | 102 | #: view:account.invoice:0 | 77 | #: view:account.invoice:0 |
612 | 103 | msgid "Shipping" | 78 | msgid "Shipping" |
613 | 104 | msgstr "" | 79 | msgstr "" |
614 | @@ -170,13 +145,6 @@ | |||
615 | 170 | msgstr "" | 145 | msgstr "" |
616 | 171 | 146 | ||
617 | 172 | #. module: l10n_it_sale | 147 | #. module: l10n_it_sale |
618 | 173 | #: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree | ||
619 | 174 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree | ||
620 | 175 | #: view:stock.picking.transportation_reason:0 | ||
621 | 176 | msgid "Reasons for transportation" | ||
622 | 177 | msgstr "" | ||
623 | 178 | |||
624 | 179 | #. module: l10n_it_sale | ||
625 | 180 | #: model:ir.actions.act_window,name:l10n_it_sale.action_carriage_condition_tree | 148 | #: model:ir.actions.act_window,name:l10n_it_sale.action_carriage_condition_tree |
626 | 181 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_carriage_condition_tree | 149 | #: model:ir.ui.menu,name:l10n_it_sale.menu_action_carriage_condition_tree |
627 | 182 | #: view:stock.picking.carriage_condition:0 | 150 | #: view:stock.picking.carriage_condition:0 |
628 | @@ -184,11 +152,6 @@ | |||
629 | 184 | msgstr "" | 152 | msgstr "" |
630 | 185 | 153 | ||
631 | 186 | #. module: l10n_it_sale | 154 | #. module: l10n_it_sale |
632 | 187 | #: help:hr.employee,fiscalcode:0 | ||
633 | 188 | msgid "Italian Fiscal Code" | ||
634 | 189 | msgstr "" | ||
635 | 190 | |||
636 | 191 | #. module: l10n_it_sale | ||
637 | 192 | #: model:ir.model,name:l10n_it_sale.model_account_invoice | 155 | #: model:ir.model,name:l10n_it_sale.model_account_invoice |
638 | 193 | msgid "Invoice" | 156 | msgid "Invoice" |
639 | 194 | msgstr "" | 157 | msgstr "" |
640 | @@ -220,3 +183,14 @@ | |||
641 | 220 | msgid "Default shipping conditions" | 183 | msgid "Default shipping conditions" |
642 | 221 | msgstr "" | 184 | msgstr "" |
643 | 222 | 185 | ||
644 | 186 | #. module: l10n_it_sale | ||
645 | 187 | #: model:ir.module.module,description:l10n_it_sale.module_meta_information | ||
646 | 188 | msgid "OpenERP Italian Localization - Sale version\n" | ||
647 | 189 | "\n" | ||
648 | 190 | "Functionalities:\n" | ||
649 | 191 | "\n" | ||
650 | 192 | "- Documento di trasporto\n" | ||
651 | 193 | "\n" | ||
652 | 194 | "" | ||
653 | 195 | msgstr "" | ||
654 | 196 |