Merge lp:~savoirfairelinux-openerp/partner-contact-management/passport_management into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions
- passport_management
- Merge into base_contact_by_functions
Proposed by
El Hadji Dem (http://www.savoirfairelinux.com)
Status: | Merged |
---|---|
Merged at revision: | 38 |
Proposed branch: | lp:~savoirfairelinux-openerp/partner-contact-management/passport_management |
Merge into: | lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions |
Diff against target: |
498 lines (+118/-161) 8 files modified
partner_multi_passport/res_partner.py (+0/-32) partner_multi_passport/res_partner_view.xml (+0/-35) passport/__init__.py (+0/-1) passport/__openerp__.py (+4/-6) passport/i18n/fr.po (+34/-44) passport/i18n/passport.pot (+32/-42) passport/res_passport.py (+0/-1) passport/res_passport_view.xml (+48/-0) |
To merge this branch: | bzr merge lp:~savoirfairelinux-openerp/partner-contact-management/passport_management |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sandy Carter (http://www.savoirfairelinux.com) | Pending | ||
Review via email: mp+202143@code.launchpad.net |
Commit message
Description of the change
Rename partner_
This module allows to manage passport. For example, you can manage multiple passports for partners or for employees.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'partner_multi_passport/res_partner.py' |
2 | --- partner_multi_passport/res_partner.py 2014-01-10 21:59:28 +0000 |
3 | +++ partner_multi_passport/res_partner.py 1970-01-01 00:00:00 +0000 |
4 | @@ -1,32 +0,0 @@ |
5 | -# -*- encoding: utf-8 -*- |
6 | -############################################################################## |
7 | -# |
8 | -# OpenERP, Open Source Management Solution |
9 | -# This module copyright (C) 2013 Savoir-faire Linux |
10 | -# (<http://www.savoirfairelinux.com>). |
11 | -# |
12 | -# This program is free software: you can redistribute it and/or modify |
13 | -# it under the terms of the GNU Affero General Public License as |
14 | -# published by the Free Software Foundation, either version 3 of the |
15 | -# License, or (at your option) any later version. |
16 | -# |
17 | -# This program is distributed in the hope that it will be useful, |
18 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
20 | -# GNU Affero General Public License for more details. |
21 | -# |
22 | -# You should have received a copy of the GNU Affero General Public License |
23 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
24 | -# |
25 | -############################################################################## |
26 | - |
27 | -from openerp.osv import orm, fields |
28 | - |
29 | - |
30 | -class res_partner(orm.Model): |
31 | - _inherit = 'res.partner' |
32 | - _columns = { |
33 | - 'passport_ids': fields.one2many('res.passport', 'partner_id', 'Passport'), |
34 | - } |
35 | - |
36 | -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
37 | |
38 | === removed file 'partner_multi_passport/res_partner_view.xml' |
39 | --- partner_multi_passport/res_partner_view.xml 2014-01-10 21:59:28 +0000 |
40 | +++ partner_multi_passport/res_partner_view.xml 1970-01-01 00:00:00 +0000 |
41 | @@ -1,35 +0,0 @@ |
42 | -<?xml version="1.0" encoding="utf-8"?> |
43 | -<openerp> |
44 | - <data> |
45 | - <record id="view_contact_by_function_form" model="ir.ui.view"> |
46 | - <field name="name">contact.functions.form.inherit</field> |
47 | - <field name="model">res.partner</field> |
48 | - <field name="inherit_id" ref="base.view_partner_form"/> |
49 | - <field name="arch" type="xml"> |
50 | - <notebook position="inside"> |
51 | - <page string="Passport" attrs="{'invisible': ['|','|',('is_company','=',True),('contact_id','!=',False)]}"> |
52 | - <field name="passport_ids" nolabel="1"> |
53 | - <tree string="Passport Details"> |
54 | - <field name="name"/> |
55 | - <field name="number"/> |
56 | - <field name="country_id"/> |
57 | - <field name="expiration_date"/> |
58 | - </tree> |
59 | - <form string="Passport" version="7.0"> |
60 | - <group col="4"> |
61 | - <field name="name" string="Owner name (As printed into the passport)"/> |
62 | - <field name="number"/> |
63 | - <field name="country_id"/> |
64 | - <field name="expiration_date"/> |
65 | - <field name="birth_date"/> |
66 | - <field name="gender"/> |
67 | - <field name="partner_id" invisible="1"/> |
68 | - </group> |
69 | - </form> |
70 | - </field> |
71 | - </page> |
72 | - </notebook> |
73 | - </field> |
74 | - </record> |
75 | - </data> |
76 | -</openerp> |
77 | |
78 | === renamed directory 'partner_multi_passport' => 'passport' |
79 | === modified file 'passport/__init__.py' |
80 | --- partner_multi_passport/__init__.py 2014-01-10 21:59:28 +0000 |
81 | +++ passport/__init__.py 2014-01-17 17:22:33 +0000 |
82 | @@ -20,7 +20,6 @@ |
83 | # |
84 | ############################################################################## |
85 | |
86 | -import res_partner |
87 | import res_passport |
88 | |
89 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
90 | |
91 | === modified file 'passport/__openerp__.py' |
92 | --- partner_multi_passport/__openerp__.py 2014-01-10 21:59:28 +0000 |
93 | +++ passport/__openerp__.py 2014-01-17 17:22:33 +0000 |
94 | @@ -21,17 +21,15 @@ |
95 | ############################################################################## |
96 | |
97 | { |
98 | - 'name': 'Partner Multi Passport', |
99 | + 'name': 'Passport Management', |
100 | 'version': '0.1', |
101 | 'author': 'Savoir-faire Linux', |
102 | 'maintainer': 'Savoir-faire Linux', |
103 | 'website': 'http://www.savoirfairelinux.com', |
104 | 'category': 'Customer Relationship Management', |
105 | 'description': """ |
106 | -Partner Multi Passport |
107 | -====================== |
108 | - |
109 | -This module allows you to manage several passports for each contact. |
110 | +Passport Management |
111 | +=================== |
112 | |
113 | Contributors |
114 | ------------ |
115 | @@ -42,7 +40,7 @@ |
116 | ], |
117 | 'external_dependencies': {}, |
118 | 'data': [ |
119 | - 'res_partner_view.xml', |
120 | + 'res_passport_view.xml', |
121 | ], |
122 | 'demo': [], |
123 | 'test': [], |
124 | |
125 | === modified file 'passport/i18n/fr.po' |
126 | --- partner_multi_passport/i18n/fr.po 2014-01-10 21:59:28 +0000 |
127 | +++ passport/i18n/fr.po 2014-01-17 17:22:33 +0000 |
128 | @@ -1,13 +1,13 @@ |
129 | # Translation of OpenERP Server. |
130 | # This file contains the translation of the following modules: |
131 | -# * partner_multi_passport |
132 | +# * passport |
133 | # |
134 | msgid "" |
135 | msgstr "" |
136 | "Project-Id-Version: OpenERP Server 7.0\n" |
137 | "Report-Msgid-Bugs-To: \n" |
138 | -"POT-Creation-Date: 2014-01-10 21:36+0000\n" |
139 | -"PO-Revision-Date: 2014-01-10 16:44-0500\n" |
140 | +"POT-Creation-Date: 2014-01-17 16:27+0000\n" |
141 | +"PO-Revision-Date: 2014-01-17 11:30-0500\n" |
142 | "Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n" |
143 | "Language-Team: \n" |
144 | "MIME-Version: 1.0\n" |
145 | @@ -16,103 +16,93 @@ |
146 | "Plural-Forms: \n" |
147 | "X-Generator: Poedit 1.5.4\n" |
148 | |
149 | -#. module: partner_multi_passport |
150 | +#. module: passport |
151 | #: help:res.passport,gender:0 |
152 | msgid "Gender." |
153 | msgstr "Sexe." |
154 | |
155 | -#. module: partner_multi_passport |
156 | -#: model:ir.model,name:partner_multi_passport.model_res_passport |
157 | -#: view:res.partner:0 field:res.partner,passport_ids:0 |
158 | +#. module: passport |
159 | +#: model:ir.actions.act_window,name:passport.action_passport_tree_list |
160 | +#: model:ir.model,name:passport.model_res_passport |
161 | msgid "Passport" |
162 | msgstr "Passeport" |
163 | |
164 | -#. module: partner_multi_passport |
165 | +#. module: passport |
166 | #: field:res.passport,country_id:0 |
167 | msgid "Delivery country" |
168 | msgstr "Pays de délivrance" |
169 | |
170 | -#. module: partner_multi_passport |
171 | -#: view:res.partner:0 |
172 | -msgid "Passport Details" |
173 | -msgstr "Détails du passeport" |
174 | - |
175 | -#. module: partner_multi_passport |
176 | +#. module: passport |
177 | #: field:res.passport,name:0 |
178 | msgid "Owner name" |
179 | msgstr "Nom du propriétaire" |
180 | |
181 | -#. module: partner_multi_passport |
182 | +#. module: passport |
183 | #: field:res.passport,gender:0 |
184 | msgid "Gender" |
185 | msgstr "Sexe" |
186 | |
187 | -#. module: partner_multi_passport |
188 | -#: field:res.passport,number:0 |
189 | -msgid "Passport No" |
190 | -msgstr "No du passeport" |
191 | - |
192 | -#. module: partner_multi_passport |
193 | -#: help:res.passport,partner_id:0 |
194 | -msgid "Contact." |
195 | -msgstr "Contact." |
196 | - |
197 | -#. module: partner_multi_passport |
198 | +#. module: passport |
199 | #: help:res.passport,expiration_date:0 |
200 | msgid "Expiration date." |
201 | msgstr "Date d'expiration." |
202 | |
203 | -#. module: partner_multi_passport |
204 | -#: view:res.partner:0 |
205 | +#. module: passport |
206 | +#: view:res.passport:0 |
207 | +msgid "PassportTree" |
208 | +msgstr "PassportTree" |
209 | + |
210 | +#. module: passport |
211 | +#: view:res.passport:0 |
212 | msgid "Owner name (As printed into the passport)" |
213 | msgstr "Nom du propriétaire (Comme écrit sur le passeport)" |
214 | |
215 | -#. module: partner_multi_passport |
216 | -#: field:res.passport,partner_id:0 |
217 | -msgid "Contact" |
218 | -msgstr "Contact" |
219 | +#. module: passport |
220 | +#: view:res.passport:0 |
221 | +msgid "PassportForm" |
222 | +msgstr "PassportForm" |
223 | |
224 | -#. module: partner_multi_passport |
225 | +#. module: passport |
226 | #: help:res.passport,number:0 |
227 | msgid "Passport number." |
228 | msgstr "Numéro du passeport." |
229 | |
230 | -#. module: partner_multi_passport |
231 | +#. module: passport |
232 | #: selection:res.passport,gender:0 |
233 | msgid "Female" |
234 | msgstr "Femme" |
235 | |
236 | -#. module: partner_multi_passport |
237 | +#. module: passport |
238 | #: help:res.passport,name:0 |
239 | msgid "Owner name (As printed into the passport)." |
240 | msgstr "Nom du propriétaire (Comme écrit sur le passeport)." |
241 | |
242 | -#. module: partner_multi_passport |
243 | -#: model:ir.model,name:partner_multi_passport.model_res_partner |
244 | -msgid "Partner" |
245 | -msgstr "Partenaire" |
246 | +#. module: passport |
247 | +#: field:res.passport,number:0 |
248 | +msgid "Passport No" |
249 | +msgstr "No du passeport" |
250 | |
251 | -#. module: partner_multi_passport |
252 | +#. module: passport |
253 | #: help:res.passport,birth_date:0 |
254 | msgid "Birth Date." |
255 | msgstr "Date de naissance." |
256 | |
257 | -#. module: partner_multi_passport |
258 | +#. module: passport |
259 | #: selection:res.passport,gender:0 |
260 | msgid "Male" |
261 | msgstr "Homme" |
262 | |
263 | -#. module: partner_multi_passport |
264 | +#. module: passport |
265 | #: help:res.passport,country_id:0 |
266 | msgid "Delivery country." |
267 | msgstr "Pays de délivrance." |
268 | |
269 | -#. module: partner_multi_passport |
270 | +#. module: passport |
271 | #: field:res.passport,expiration_date:0 |
272 | msgid "Expiration date" |
273 | msgstr "Date d'expiration" |
274 | |
275 | -#. module: partner_multi_passport |
276 | +#. module: passport |
277 | #: field:res.passport,birth_date:0 |
278 | msgid "Birth Date" |
279 | msgstr "Date de naissance" |
280 | |
281 | === renamed file 'partner_multi_passport/i18n/partner_multi_passport.pot' => 'passport/i18n/passport.pot' |
282 | --- partner_multi_passport/i18n/partner_multi_passport.pot 2014-01-10 21:59:28 +0000 |
283 | +++ passport/i18n/passport.pot 2014-01-17 17:22:33 +0000 |
284 | @@ -1,13 +1,13 @@ |
285 | # Translation of OpenERP Server. |
286 | # This file contains the translation of the following modules: |
287 | -# * partner_multi_passport |
288 | +# * passport |
289 | # |
290 | msgid "" |
291 | msgstr "" |
292 | "Project-Id-Version: OpenERP Server 7.0\n" |
293 | "Report-Msgid-Bugs-To: \n" |
294 | -"POT-Creation-Date: 2014-01-10 21:36+0000\n" |
295 | -"PO-Revision-Date: 2014-01-10 16:36-0500\n" |
296 | +"POT-Creation-Date: 2014-01-17 16:26+0000\n" |
297 | +"PO-Revision-Date: 2014-01-17 11:26-0500\n" |
298 | "Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n" |
299 | "Language-Team: \n" |
300 | "MIME-Version: 1.0\n" |
301 | @@ -16,103 +16,93 @@ |
302 | "Plural-Forms: \n" |
303 | "X-Generator: Poedit 1.5.4\n" |
304 | |
305 | -#. module: partner_multi_passport |
306 | +#. module: passport |
307 | #: help:res.passport,gender:0 |
308 | msgid "Gender." |
309 | msgstr "" |
310 | |
311 | -#. module: partner_multi_passport |
312 | -#: model:ir.model,name:partner_multi_passport.model_res_passport |
313 | -#: view:res.partner:0 field:res.partner,passport_ids:0 |
314 | +#. module: passport |
315 | +#: model:ir.actions.act_window,name:passport.action_passport_tree_list |
316 | +#: model:ir.model,name:passport.model_res_passport |
317 | msgid "Passport" |
318 | msgstr "" |
319 | |
320 | -#. module: partner_multi_passport |
321 | +#. module: passport |
322 | #: field:res.passport,country_id:0 |
323 | msgid "Delivery country" |
324 | msgstr "" |
325 | |
326 | -#. module: partner_multi_passport |
327 | -#: view:res.partner:0 |
328 | -msgid "Passport Details" |
329 | -msgstr "" |
330 | - |
331 | -#. module: partner_multi_passport |
332 | +#. module: passport |
333 | #: field:res.passport,name:0 |
334 | msgid "Owner name" |
335 | msgstr "" |
336 | |
337 | -#. module: partner_multi_passport |
338 | +#. module: passport |
339 | #: field:res.passport,gender:0 |
340 | msgid "Gender" |
341 | msgstr "" |
342 | |
343 | -#. module: partner_multi_passport |
344 | -#: field:res.passport,number:0 |
345 | -msgid "Passport No" |
346 | -msgstr "" |
347 | - |
348 | -#. module: partner_multi_passport |
349 | -#: help:res.passport,partner_id:0 |
350 | -msgid "Contact." |
351 | -msgstr "" |
352 | - |
353 | -#. module: partner_multi_passport |
354 | +#. module: passport |
355 | #: help:res.passport,expiration_date:0 |
356 | msgid "Expiration date." |
357 | msgstr "" |
358 | |
359 | -#. module: partner_multi_passport |
360 | -#: view:res.partner:0 |
361 | +#. module: passport |
362 | +#: view:res.passport:0 |
363 | +msgid "PassportTree" |
364 | +msgstr "" |
365 | + |
366 | +#. module: passport |
367 | +#: view:res.passport:0 |
368 | msgid "Owner name (As printed into the passport)" |
369 | msgstr "" |
370 | |
371 | -#. module: partner_multi_passport |
372 | -#: field:res.passport,partner_id:0 |
373 | -msgid "Contact" |
374 | +#. module: passport |
375 | +#: view:res.passport:0 |
376 | +msgid "PassportForm" |
377 | msgstr "" |
378 | |
379 | -#. module: partner_multi_passport |
380 | +#. module: passport |
381 | #: help:res.passport,number:0 |
382 | msgid "Passport number." |
383 | msgstr "" |
384 | |
385 | -#. module: partner_multi_passport |
386 | +#. module: passport |
387 | #: selection:res.passport,gender:0 |
388 | msgid "Female" |
389 | msgstr "" |
390 | |
391 | -#. module: partner_multi_passport |
392 | +#. module: passport |
393 | #: help:res.passport,name:0 |
394 | msgid "Owner name (As printed into the passport)." |
395 | msgstr "" |
396 | |
397 | -#. module: partner_multi_passport |
398 | -#: model:ir.model,name:partner_multi_passport.model_res_partner |
399 | -msgid "Partner" |
400 | +#. module: passport |
401 | +#: field:res.passport,number:0 |
402 | +msgid "Passport No" |
403 | msgstr "" |
404 | |
405 | -#. module: partner_multi_passport |
406 | +#. module: passport |
407 | #: help:res.passport,birth_date:0 |
408 | msgid "Birth Date." |
409 | msgstr "" |
410 | |
411 | -#. module: partner_multi_passport |
412 | +#. module: passport |
413 | #: selection:res.passport,gender:0 |
414 | msgid "Male" |
415 | msgstr "" |
416 | |
417 | -#. module: partner_multi_passport |
418 | +#. module: passport |
419 | #: help:res.passport,country_id:0 |
420 | msgid "Delivery country." |
421 | msgstr "" |
422 | |
423 | -#. module: partner_multi_passport |
424 | +#. module: passport |
425 | #: field:res.passport,expiration_date:0 |
426 | msgid "Expiration date" |
427 | msgstr "" |
428 | |
429 | -#. module: partner_multi_passport |
430 | +#. module: passport |
431 | #: field:res.passport,birth_date:0 |
432 | msgid "Birth Date" |
433 | msgstr "" |
434 | |
435 | === modified file 'passport/res_passport.py' |
436 | --- partner_multi_passport/res_passport.py 2014-01-10 21:59:28 +0000 |
437 | +++ passport/res_passport.py 2014-01-17 17:22:33 +0000 |
438 | @@ -41,7 +41,6 @@ |
439 | ('female', 'Female')], |
440 | 'Gender', |
441 | help="Gender."), |
442 | - 'partner_id': fields.many2one('res.partner', 'Contact', help="Contact."), |
443 | } |
444 | |
445 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
446 | |
447 | === added file 'passport/res_passport_view.xml' |
448 | --- passport/res_passport_view.xml 1970-01-01 00:00:00 +0000 |
449 | +++ passport/res_passport_view.xml 2014-01-17 17:22:33 +0000 |
450 | @@ -0,0 +1,48 @@ |
451 | +<?xml version="1.0" ?> |
452 | +<openerp> |
453 | + <data> |
454 | + <!-- Tree Views passport--> |
455 | + <record model="ir.ui.view" id="passport_tree_view"> |
456 | + <field name="name">Passport Tree View</field> |
457 | + <field name="model">res.passport</field> |
458 | + <field name="type">tree</field> |
459 | + <field name="arch" type="xml"> |
460 | + <tree string="PassportTree" version="7.0"> |
461 | + <field name="name"/> |
462 | + <field name="number"/> |
463 | + <field name="country_id"/> |
464 | + <field name="expiration_date"/> |
465 | + <field name="gender"/> |
466 | + <field name="birth_date"/> |
467 | + </tree> |
468 | + </field> |
469 | + </record> |
470 | + |
471 | + <!-- Form Views passport--> |
472 | + <record model="ir.ui.view" id="passport_form_view"> |
473 | + <field name="name">Passport Form View</field> |
474 | + <field name="model">res.passport</field> |
475 | + <field name="type">form</field> |
476 | + <field name="arch" type="xml"> |
477 | + <form string="PassportForm" version="7.0" > |
478 | + <group col="4"> |
479 | + <field name="name" string="Owner name (As printed into the passport)"/> |
480 | + <field name="number"/> |
481 | + <field name="country_id"/> |
482 | + <field name="expiration_date"/> |
483 | + <field name="birth_date"/> |
484 | + <field name="gender"/> |
485 | + </group> |
486 | + </form> |
487 | + </field> |
488 | + </record> |
489 | + |
490 | + <!-- Actions --> |
491 | + <record model="ir.actions.act_window" id="action_passport_tree_list"> |
492 | + <field name="name">Passport</field> |
493 | + <field name="view_id" ref="passport_tree_view"/> |
494 | + <field name="res_model">res.passport</field> |
495 | + <field name="view_mode">tree,form</field> |
496 | + </record> |
497 | + </data> |
498 | +</openerp> |