diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index bb36d161caa..368451061a0 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -7,7 +7,7 @@
form
diff --git a/addons/sync_base/wizard/sync_base_view.xml b/addons/sync_base/wizard/sync_base_view.xml
index 6f61e0b6855..c957993fe67 100644
--- a/addons/sync_base/wizard/sync_base_view.xml
+++ b/addons/sync_base/wizard/sync_base_view.xml
@@ -10,9 +10,12 @@
-
-
-
+
+
+
+
+
+
diff --git a/addons/sync_base/wizard/synchronize_base.py b/addons/sync_base/wizard/synchronize_base.py
index 4a20b0cf2b5..9077b32398b 100644
--- a/addons/sync_base/wizard/synchronize_base.py
+++ b/addons/sync_base/wizard/synchronize_base.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv,orm
+from osv import fields,osv
from tools.translate import _
@@ -46,7 +46,7 @@ class synchronize_base(osv.osv_memory):
def _get_action(self, cr, uid, tools, context=None):
if not tools:
- tools = 'none'
+ raise osv.except_osv(_("Error !"),_("Select App to synchronize with."))
return self._get_actions_dic(cr, uid, context=context)[tools]
def _get_actions_dic(self, cr, uid, context=None):
diff --git a/addons/sync_google_contact/wizard/google_contact_import.py b/addons/sync_google_contact/wizard/google_contact_import.py
index d2eb2015065..0e937e40ebd 100644
--- a/addons/sync_google_contact/wizard/google_contact_import.py
+++ b/addons/sync_google_contact/wizard/google_contact_import.py
@@ -119,9 +119,6 @@ class synchronize_google_contact(osv.osv_memory):
res.append(('all','All Groups'))
return res
- def _get_default_group(self, cr, uid, context=None):
- return 'all'
-
_columns = {
'create_partner': fields.selection([('create_all','Create partner for each contact'),('create_address','Import only address')],'Options'),
'group_name': fields.selection(_get_group, "Group Name", size=32,help="Choose which group to import, By default it takes all."),
@@ -129,7 +126,7 @@ class synchronize_google_contact(osv.osv_memory):
_defaults = {
'create_partner': 'create_all',
- 'group_name': _get_default_group,
+ 'group_name': 'all',
}
def create_partner(self, cr, uid, data={}, context=None):
diff --git a/addons/sync_google_contact/wizard/google_contact_import_view.xml b/addons/sync_google_contact/wizard/google_contact_import_view.xml
index be4033b734c..c3093d4a342 100644
--- a/addons/sync_google_contact/wizard/google_contact_import_view.xml
+++ b/addons/sync_google_contact/wizard/google_contact_import_view.xml
@@ -7,15 +7,18 @@
form