diff --git a/passport/__init__.py b/passport/__init__.py index ef5bc44bd..1646d79a2 100644 --- a/passport/__init__.py +++ b/passport/__init__.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux +# This module copyright (C) 2013-2014 Savoir-faire Linux # (). # # This program is free software: you can redistribute it and/or modify @@ -21,5 +21,4 @@ ############################################################################## from . import res_passport - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +from . import res_partner diff --git a/passport/__openerp__.py b/passport/__openerp__.py index 63d9af784..1589c9cf0 100644 --- a/passport/__openerp__.py +++ b/passport/__openerp__.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux +# This module copyright (C) 2013-2014 Savoir-faire Linux # (). # # This program is free software: you can redistribute it and/or modify @@ -26,6 +26,7 @@ 'author': 'Savoir-faire Linux', 'maintainer': 'Savoir-faire Linux', 'website': 'http://www.savoirfairelinux.com', + 'license': 'AGPL-3', 'category': 'Customer Relationship Management', 'description': """ Passport Management @@ -34,19 +35,16 @@ Passport Management Contributors ------------ * El Hadji Dem (elhadji.dem@savoirfairelinux.com) +* Sandy Carter (sandy.carter@savoirfairelinux.com) """, - 'depends': [ - 'base', - ], + 'depends': [], 'external_dependencies': {}, 'data': [ 'res_passport_view.xml', + "res_partner_view.xml", 'security/ir.model.access.csv', ], 'demo': [], 'test': [], 'installable': True, - 'active': False, } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/passport/i18n/fr.po b/passport/i18n/fr.po index 83cc49aff..8fb1fceb0 100644 --- a/passport/i18n/fr.po +++ b/passport/i18n/fr.po @@ -6,15 +6,26 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-17 16:27+0000\n" -"PO-Revision-Date: 2014-01-17 11:30-0500\n" -"Last-Translator: EL Hadji DEM \n" +"POT-Creation-Date: 2014-02-24 23:40+0000\n" +"PO-Revision-Date: 2014-02-24 18:47-0500\n" +"Last-Translator: Sandy Carter \n" "Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.6.4\n" + +#. module: passport +#: help:res.passport,country_id:0 +msgid "Country of deliverance." +msgstr "Pays émetteur." + +#. module: passport +#: help:res.passport,birth_date:0 +msgid "Date of birth on passport." +msgstr "Date de naissance sur le passeport." #. module: passport #: help:res.passport,gender:0 @@ -23,7 +34,8 @@ msgstr "Sexe." #. module: passport #: model:ir.actions.act_window,name:passport.action_passport_tree_list -#: model:ir.model,name:passport.model_res_passport +#: model:ir.model,name:passport.model_res_passport view:res.partner:0 +#: field:res.partner,passport_ids:0 msgid "Passport" msgstr "Passeport" @@ -42,10 +54,15 @@ msgstr "Nom du propriétaire" msgid "Gender" msgstr "Sexe" +#. module: passport +#: field:res.passport,number:0 +msgid "Passport No" +msgstr "No du passeport" + #. module: passport #: help:res.passport,expiration_date:0 -msgid "Expiration date." -msgstr "Date d'expiration." +msgid "Expiration date of passport." +msgstr "Date d'expiration sur le passeport." #. module: passport #: view:res.passport:0 @@ -53,15 +70,21 @@ msgid "PassportTree" msgstr "PassportTree" #. module: passport -#: view:res.passport:0 -msgid "Owner name (As printed into the passport)" -msgstr "Nom du propriétaire (Comme écrit sur le passeport)" +#: code:addons/passport/res_partner.py:39 +#, python-format +msgid "New Passport" +msgstr "Nouveau passeport" #. module: passport #: view:res.passport:0 msgid "PassportForm" msgstr "PassportForm" +#. module: passport +#: field:res.passport,partner_id:0 +msgid "Contact" +msgstr "Contact" + #. module: passport #: help:res.passport,number:0 msgid "Passport number." @@ -78,14 +101,9 @@ msgid "Owner name (As printed into the passport)." msgstr "Nom du propriétaire (Comme écrit sur le passeport)." #. module: passport -#: field:res.passport,number:0 -msgid "Passport No" -msgstr "No du passeport" - -#. module: passport -#: help:res.passport,birth_date:0 -msgid "Birth Date." -msgstr "Date de naissance." +#: model:ir.model,name:passport.model_res_partner +msgid "Partner" +msgstr "Organisme" #. module: passport #: selection:res.passport,gender:0 @@ -93,9 +111,9 @@ msgid "Male" msgstr "Homme" #. module: passport -#: help:res.passport,country_id:0 -msgid "Delivery country." -msgstr "Pays de délivrance." +#: view:res.passport:0 +msgid "Owner name (As printed into the passport)" +msgstr "Nom du propriétaire (Comme écrit sur le passeport)" #. module: passport #: field:res.passport,expiration_date:0 diff --git a/passport/i18n/passport.pot b/passport/i18n/passport.pot index 5666d1851..62a361c40 100644 --- a/passport/i18n/passport.pot +++ b/passport/i18n/passport.pot @@ -1,20 +1,29 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * passport +# * passport # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-17 16:26+0000\n" -"PO-Revision-Date: 2014-01-17 11:26-0500\n" -"Last-Translator: EL Hadji DEM \n" +"POT-Creation-Date: 2014-02-24 23:40+0000\n" +"PO-Revision-Date: 2014-02-24 23:40+0000\n" +"Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"X-Generator: Poedit 1.5.4\n" + +#. module: passport +#: help:res.passport,country_id:0 +msgid "Country of deliverance." +msgstr "" + +#. module: passport +#: help:res.passport,birth_date:0 +msgid "Date of birth on passport." +msgstr "" #. module: passport #: help:res.passport,gender:0 @@ -24,6 +33,8 @@ msgstr "" #. module: passport #: model:ir.actions.act_window,name:passport.action_passport_tree_list #: model:ir.model,name:passport.model_res_passport +#: view:res.partner:0 +#: field:res.partner,passport_ids:0 msgid "Passport" msgstr "" @@ -42,9 +53,14 @@ msgstr "" msgid "Gender" msgstr "" +#. module: passport +#: field:res.passport,number:0 +msgid "Passport No" +msgstr "" + #. module: passport #: help:res.passport,expiration_date:0 -msgid "Expiration date." +msgid "Expiration date of passport." msgstr "" #. module: passport @@ -53,8 +69,9 @@ msgid "PassportTree" msgstr "" #. module: passport -#: view:res.passport:0 -msgid "Owner name (As printed into the passport)" +#: code:addons/passport/res_partner.py:39 +#, python-format +msgid "New Passport" msgstr "" #. module: passport @@ -62,6 +79,11 @@ msgstr "" msgid "PassportForm" msgstr "" +#. module: passport +#: field:res.passport,partner_id:0 +msgid "Contact" +msgstr "" + #. module: passport #: help:res.passport,number:0 msgid "Passport number." @@ -78,13 +100,8 @@ msgid "Owner name (As printed into the passport)." msgstr "" #. module: passport -#: field:res.passport,number:0 -msgid "Passport No" -msgstr "" - -#. module: passport -#: help:res.passport,birth_date:0 -msgid "Birth Date." +#: model:ir.model,name:passport.model_res_partner +msgid "Partner" msgstr "" #. module: passport @@ -93,8 +110,8 @@ msgid "Male" msgstr "" #. module: passport -#: help:res.passport,country_id:0 -msgid "Delivery country." +#: view:res.passport:0 +msgid "Owner name (As printed into the passport)" msgstr "" #. module: passport diff --git a/passport_partner/res_passport.py b/passport/res_partner.py similarity index 76% rename from passport_partner/res_passport.py rename to passport/res_partner.py index 43d4fad7c..3ad15e2d3 100644 --- a/passport_partner/res_passport.py +++ b/passport/res_partner.py @@ -1,8 +1,8 @@ # -*- encoding: utf-8 -*- -############################################################################### +############################################################################## # # OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux +# This module copyright (C) 2013-2014 Savoir-faire Linux # (). # # This program is free software: you can redistribute it and/or modify @@ -18,14 +18,14 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################### +############################################################################## -from openerp.osv import fields, orm +from openerp.osv import orm, fields -class res_passport(orm.Model): - """Add contact""" - _inherit = 'res.passport' +class res_partner(orm.Model): + _inherit = 'res.partner' _columns = { - 'partner_id': fields.many2one('res.partner', 'Contact', help="Contact."), + 'passport_ids': fields.one2many( + 'res.passport', 'partner_id', 'Passport'), } diff --git a/passport/res_partner_view.xml b/passport/res_partner_view.xml new file mode 100644 index 000000000..ce81a8f73 --- /dev/null +++ b/passport/res_partner_view.xml @@ -0,0 +1,17 @@ + + + + + res.partner + + + + + + + + + + + + diff --git a/passport/res_passport.py b/passport/res_passport.py index c87432ca1..72f4f5a6d 100644 --- a/passport/res_passport.py +++ b/passport/res_passport.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux +# This module copyright (C) 2013-2014 Savoir-faire Linux # (). # # This program is free software: you can redistribute it and/or modify @@ -27,34 +27,30 @@ class res_passport(orm.Model): _description = 'Passport' _name = 'res.passport' _columns = { - 'name': fields.char('Owner name', size=256, select=True, - help='Owner name (As printed into the passport).'), - 'number': fields.char('Passport No', size=50, - help='Passport number.'), - 'country_id': fields.many2one('res.country', 'Delivery country', - help="Delivery country."), - 'expiration_date': fields.date('Expiration date', - help="Expiration date."), - 'birth_date': fields.date('Birth Date', help="Birth Date."), - 'gender': fields.selection([('male', 'Male'), - ('female', 'Female')], - 'Gender', - help="Gender."), + 'name': fields.char( + 'Owner name', help='Owner name (As printed into the passport).'), + 'number': fields.char( + 'Passport No', size=50, help='Passport number.'), + 'country_id': fields.many2one( + 'res.country', 'Delivery country', help="Country of deliverance."), + 'expiration_date': fields.date( + 'Expiration date', help="Expiration date of passport."), + 'birth_date': fields.date('Birth Date', + help="Date of birth on passport."), + 'gender': fields.selection( + [('male', 'Male'), + ('female', 'Female')], + 'Gender', help="Gender."), + 'partner_id': fields.many2one('res.partner', 'Contact'), } def name_get(self, cr, uid, ids, context=None): - if context is None: - context = {} - if isinstance(ids, (int, long)): + if type(ids) in (int, long): ids = [ids] res = [] - reads = self.read(cr, uid, ids, ['name', 'country_id'], context) - - for record in reads: - name = record['name'] - if record['country_id']: - name = record['country_id'][1] + ' | ' + name - res.append((record['id'], name)) + for res_passport in self.browse(cr, uid, ids, context=context): + name = res_passport.name + if res_passport.country_id and res_passport.country_id.name: + name = '%s | %s' % (res_passport.country_id.name, name) + res.append((res_passport.id, name)) return res - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/passport/res_passport_view.xml b/passport/res_passport_view.xml index 7d6117e5a..3bc4fac37 100644 --- a/passport/res_passport_view.xml +++ b/passport/res_passport_view.xml @@ -8,12 +8,10 @@ tree - - + - - + diff --git a/passport_partner/__init__.py b/passport_partner/__init__.py deleted file mode 100644 index ec9b0697a..000000000 --- a/passport_partner/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################### -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux -# (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### - -from . import res_passport -from . import res_partner diff --git a/passport_partner/__openerp__.py b/passport_partner/__openerp__.py deleted file mode 100644 index d021a5ab5..000000000 --- a/passport_partner/__openerp__.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################### -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux -# (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### - -{ - 'name': 'Passport Management - Partners Bindings', - 'version': '0.1', - 'author': 'Savoir-faire Linux', - 'maintainer': 'Savoir-faire Linux', - 'website': 'http://www.savoirfairelinux.com', - 'license': 'AGPL-3', - 'category': 'Customer Relationship Management', - 'summary': 'Partner Multi Passport', - 'description': """ -Passport Management - Partners Bindings -======================================= - -This module allows you to manage several passports for each contact. - -Contributors ------------- -* El Hadji Dem (elhadji.dem@savoirfairelinux.com) - -""", - 'depends': [ - 'passport' - ], - 'external_dependencies': { - 'python': [], - }, - 'data': [ - "res_partner_view.xml", - ], - 'demo': [], - 'test': [], - 'installable': True, -} - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/passport_partner/i18n/fr.po b/passport_partner/i18n/fr.po deleted file mode 100644 index 8cd21dd24..000000000 --- a/passport_partner/i18n/fr.po +++ /dev/null @@ -1,76 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * passport_partner -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-05 22:07+0000\n" -"PO-Revision-Date: 2014-02-05 17:09-0500\n" -"Last-Translator: EL Hadji DEM \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" -"X-Generator: Poedit 1.5.4\n" - -#. module: passport_partner -#: view:res.partner:0 -msgid "Create" -msgstr "Créer" - -#. module: passport_partner -#: view:res.partner:0 -msgid "Passport Details" -msgstr "Détails du passeport" - -#. module: passport_partner -#: view:res.passport:0 -msgid "or" -msgstr "ou" - -#. module: passport_partner -#: code:addons/passport_partner/res_partner.py:37 -#: code:addons/passport_partner/res_partner.py:38 -#, python-format -msgid "New Passport" -msgstr "Nouveau passeport" - -#. module: passport_partner -#: view:res.passport:0 -msgid "Save and Close" -msgstr "Enregistrer et fermer" - -#. module: passport_partner -#: field:res.passport,partner_id:0 -msgid "Contact" -msgstr "Contact" - -#. module: passport_partner -#: model:ir.actions.act_window,name:passport_partner.action_passport_list -#: model:ir.model,name:passport_partner.model_res_passport view:res.partner:0 -#: field:res.partner,passport_ids:0 view:res.passport:0 -msgid "Passport" -msgstr "Passeport" - -#. module: passport_partner -#: model:ir.model,name:passport_partner.model_res_partner -msgid "Partner" -msgstr "Organisme" - -#. module: passport_partner -#: view:res.passport:0 -msgid "Discard" -msgstr "Annuler" - -#. module: passport_partner -#: help:res.passport,partner_id:0 -msgid "Contact." -msgstr "Contact." - -#. module: passport_partner -#: view:res.partner:0 view:res.passport:0 -msgid "Owner name (As printed into the passport)" -msgstr "Nom du propriétaire (Comme écrit sur le passeport)" diff --git a/passport_partner/i18n/passport_partner.pot b/passport_partner/i18n/passport_partner.pot deleted file mode 100644 index caf8492c9..000000000 --- a/passport_partner/i18n/passport_partner.pot +++ /dev/null @@ -1,76 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * passport_partner -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-05 22:05+0000\n" -"PO-Revision-Date: 2014-02-05 17:06-0500\n" -"Last-Translator: EL Hadji DEM \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" -"X-Generator: Poedit 1.5.4\n" - -#. module: passport_partner -#: view:res.partner:0 -msgid "Create" -msgstr "" - -#. module: passport_partner -#: view:res.partner:0 -msgid "Passport Details" -msgstr "" - -#. module: passport_partner -#: view:res.passport:0 -msgid "or" -msgstr "" - -#. module: passport_partner -#: code:addons/passport_partner/res_partner.py:37 -#: code:addons/passport_partner/res_partner.py:38 -#, python-format -msgid "New Passport" -msgstr "" - -#. module: passport_partner -#: view:res.passport:0 -msgid "Save and Close" -msgstr "" - -#. module: passport_partner -#: field:res.passport,partner_id:0 -msgid "Contact" -msgstr "" - -#. module: passport_partner -#: model:ir.actions.act_window,name:passport_partner.action_passport_list -#: model:ir.model,name:passport_partner.model_res_passport view:res.partner:0 -#: field:res.partner,passport_ids:0 view:res.passport:0 -msgid "Passport" -msgstr "" - -#. module: passport_partner -#: model:ir.model,name:passport_partner.model_res_partner -msgid "Partner" -msgstr "" - -#. module: passport_partner -#: view:res.passport:0 -msgid "Discard" -msgstr "" - -#. module: passport_partner -#: help:res.passport,partner_id:0 -msgid "Contact." -msgstr "" - -#. module: passport_partner -#: view:res.partner:0 view:res.passport:0 -msgid "Owner name (As printed into the passport)" -msgstr "" diff --git a/passport_partner/res_partner.py b/passport_partner/res_partner.py deleted file mode 100644 index 60439455b..000000000 --- a/passport_partner/res_partner.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Savoir-faire Linux -# (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm, fields -from openerp.tools.translate import _ - - -class res_partner(orm.Model): - _inherit = 'res.partner' - _columns = { - 'passport_ids': fields.one2many('res.passport', 'partner_id', 'Passport'), - } - - def action_add_passport_form_view(self, cr, uid, ids, context=None): - """Call action, if there is a contact, put it in the name.""" - ir_model_data = self.pool.get('ir.model.data') - contacts = self.browse(cr, uid, ids, context=context) - contact_name = ('%s : %s ' % (contacts[0].full_name, _('New Passport')) if len(contacts) == 1 else False) - name = contact_name or _('New Passport') - try: - compose_form_id = ir_model_data.get_object_reference(cr, uid, 'passport_partner', 'add_passport_form_view')[1] - except ValueError: - compose_form_id = False - ctx = dict(context) - ctx.update({ - 'default_res_id': ids[0], - 'default_partner_id': ids[0], - }) - return { - 'name': name, - 'type': 'ir.actions.act_window', - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'res.passport', - 'views': [(compose_form_id, 'form')], - 'view_id': compose_form_id, - 'target': 'new', - 'context': ctx, - } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/passport_partner/res_partner_view.xml b/passport_partner/res_partner_view.xml deleted file mode 100644 index 9a5f72af4..000000000 --- a/passport_partner/res_partner_view.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - passport.partner.form.inherit - res.partner - - - - -