diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index b1a1ff0fe18..f48526b6846 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -37,7 +37,7 @@ class crm_installer(osv.osv_memory): 'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), 'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), 'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."), - 'import_google': fields.boolean('Google Contacts', help="Imports contacts from your google account."), + 'import_google': fields.boolean('Google Import', help="Imports contacts from your google account."), } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py index 9c468bf5609..003d9c9acb5 100644 --- a/addons/import_google/__openerp__.py +++ b/addons/import_google/__openerp__.py @@ -31,6 +31,7 @@ 'update_xml': [ 'sync_google_calendar_view.xml', 'wizard/import_google_data_view.xml', + 'wizard/google_import_message_view.xml' ], 'demo_xml': [], 'test': [ diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py index 233409a111e..41c118a0ef3 100644 --- a/addons/import_google/wizard/__init__.py +++ b/addons/import_google/wizard/__init__.py @@ -20,4 +20,5 @@ ############################################################################## import import_google import import_google_data +import google_import_message # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/import_google/wizard/google_import_message.py b/addons/import_google/wizard/google_import_message.py new file mode 100644 index 00000000000..5e2b2b6f4b1 --- /dev/null +++ b/addons/import_google/wizard/google_import_message.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 osv import osv +from osv import fields + + +class google_import_message(osv.osv): + """Import Message""" + + _name = "google.import.message" + _description = "Import Message" + _columns = { + 'name': fields.text('Message', readonly=True), + } + + def default_get(self, cr, uid, fields, context=None): + if context == None: + context = {} + res = super(google_import_message, self).default_get(cr, uid, fields, context=context) + res.update({'name': context.get('message')}) + return res + +google_import_message() diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml new file mode 100644 index 00000000000..639f3da16bd --- /dev/null +++ b/addons/import_google/wizard/google_import_message_view.xml @@ -0,0 +1,25 @@ + + + + + + google.import.message.form + google.import.message + form + +
+ + + + + + + +