[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk

4 files changed, 10 insertions, 11 deletions

diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index bcfa5f204e2..dee0e608d45 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -41,6 +41,6 @@
              #'test/test_sync_google_calendar.yml',
     ],
     'installable': True,
-    'active': False,
+    'auto_install': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/i18n/import_google.pot b/addons/import_google/i18n/import_google.pot
index baac7530e4b..989e4c16521 100644
--- a/addons/import_google/i18n/import_google.pot
+++ b/addons/import_google/i18n/import_google.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1beta\n"
+"Project-Id-Version: OpenERP Server 6.1rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-12-22 18:44+0000\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-02-08 00:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgid "No Google Username or password Defined for user.\n"
 msgstr ""
 
 #. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:128
+#: code:addons/import_google/wizard/import_google_data.py:127
 #, python-format
 msgid "Invalid login detail !\n"
 " Specify Username/Password."
@@ -98,7 +98,7 @@ msgid "Import contacts from a google account"
 msgstr ""
 
 #. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:134
+#: code:addons/import_google/wizard/import_google_data.py:133
 #, python-format
 msgid "Please specify correct user and password !"
 msgstr ""
@@ -136,8 +136,8 @@ msgid "Import google"
 msgstr ""
 
 #. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:128
-#: code:addons/import_google/wizard/import_google_data.py:134
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
 #, python-format
 msgid "Error"
 msgstr ""
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index 936a6d17649..f241fabf412 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -51,7 +51,6 @@ class google_import(import_framework):
 
     def initialize(self):
         google = self.obj.pool.get('google.login')
-        self.external_id_field = 'Id'
         self.gd_client = google.google_login(self.context.get('user'),
                                        self.context.get('password'),
                                         self.context.get('instance'))
diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py
index d87af3dd69d..4e16c039742 100644
--- a/addons/import_google/wizard/import_google_data.py
+++ b/addons/import_google/wizard/import_google_data.py
@@ -100,8 +100,8 @@ class synchronize_google(osv.osv_memory):
         'create_partner': fields.selection([('create_all','Create partner for each contact'),('create_address','Import only address')],'Options'),
         'customer': fields.boolean('Customer', help="Check this box to set newly created partner as Customer."),
         'supplier': fields.boolean('Supplier', help="Check this box to set newly created partner as Supplier."),
-        'group_name': fields.selection(_get_group, "Group Name", size=32,help="Choose which group to import, By default it takes all."),
-        'calendar_name': fields.selection(_get_calendars, "Calendar Name", size=32),
+        'group_name': fields.selection(_get_group, "Group Name",help="Choose which group to import, By default it takes all."),
+        'calendar_name': fields.selection(_get_calendars, "Calendar Name"),
      }
 
     _defaults = {