From d289d55e2a874e01e1718384ee735fa6fdc62d64 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Fri, 25 Feb 2011 14:52:40 +0530
Subject: [PATCH 1/4] [FIX] base_sync : usability imp and if no app slected
 raise message

bzr revid: jam@tinyerp.com-20110225092240-ttj1xmkbzb9p82if
---
 addons/sync_base/wizard/sync_base_view.xml  | 9 ++++++---
 addons/sync_base/wizard/synchronize_base.py | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

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 @@
                    <field name="tools"/>
                    <newline />
                    <separator string="" colspan="4"/>
-                   <group colspan="4" col="2">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="action_synchronize" string="Synchronize" type="object" icon="terp-check"/>
+                   <group colspan="4" col="4">
+                        <group colspan="2"/>
+                        <group colspan="2">  
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="action_synchronize" string="_Synchronize" type="object" icon="terp-check"/>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/sync_base/wizard/synchronize_base.py b/addons/sync_base/wizard/synchronize_base.py
index 4a20b0cf2b5..8f49154f1b9 100644
--- a/addons/sync_base/wizard/synchronize_base.py
+++ b/addons/sync_base/wizard/synchronize_base.py
@@ -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):

From afac4f3f5b407b0d06f04588b4ed7bab6b608aac Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Fri, 25 Feb 2011 15:01:16 +0530
Subject: [PATCH 2/4] [IMP] google_base_account : wizard login view usability
 improvements

bzr revid: jam@tinyerp.com-20110225093116-d7p8um1bgy4c4agl
---
 .../google_base_account/wizard/google_login_view.xml  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Google login" >
-                    <group colspan="4" col="4" width="250">
+                    <group colspan="4" col="4" width="300">
                         <field name="user" />
                         <newline/>
                         <label string="ex: user@gmail.com" align="1.0" colspan="2"/>
@@ -15,9 +15,12 @@
                         <field name="password" password="True"/>
                     </group>
                     <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="check_login" string="Login" type="object" icon="terp-check"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2"/>
+                        <group colspan="2">  
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="check_login" string="_Login" type="object" icon="terp-check"/>
+                        </group>
                     </group>
                 </form>
             </field>

From 59d5f1ca39e423b37e0fab53ad8675ed65279970 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Fri, 25 Feb 2011 15:07:17 +0530
Subject: [PATCH 3/4] [IMP] sync_google_contact : usability improvements added
 shortcuts to bottons removed used function call

bzr revid: jam@tinyerp.com-20110225093717-jf766b01h7t7id5l
---
 .../wizard/google_contact_import.py                 |  5 +----
 .../wizard/google_contact_import_view.xml           | 13 ++++++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/sync_google_contact/wizard/google_contact_import.py b/addons/sync_google_contact/wizard/google_contact_import.py
index 6900589680f..b22c2460c1d 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.boolean('Create Partner', help="It will create Partner for given gmail user otherwise only adds contacts in Partner Addresses.")  ,
         'group_name': fields.selection(_get_group, "Group Name", size=32,help="Choose which group to import, By defult it take all "),
@@ -129,7 +126,7 @@ class synchronize_google_contact(osv.osv_memory):
 
     _defaults = {
         'create_partner': True,
-        '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 45ec2177375..41e02dcb7a8 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 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Contacts">
-                    <group colspan="2" col="2">
+                    <group colspan="4" col="4">
                        <field name="group_name" />
                        <separator string="Do you want to create partner?" colspan="4"/>
-                       <field name="create_partner"/>
+                       <field name="create_partner" colspan="4"/>
                     </group>
                     <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="import_contact" string="Import Contacts" type="object" icon="terp-personal+"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2" col="2"/>
+                        <group colspan="2" col="2">
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="import_contact" string="_Import Contacts" type="object" icon="terp-personal+"/>
+                        </group>
                     </group>
                 </form>
             </field>

From 9bddcec8318de55538865c0d5da15a3be7d9446b Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Fri, 25 Feb 2011 16:23:05 +0530
Subject: [PATCH 4/4] [FIX] sync_base : fixed the buidbot warning

bzr revid: jam@tinyerp.com-20110225105305-nxzcm1pgf6kigqi6
---
 addons/sync_base/wizard/synchronize_base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sync_base/wizard/synchronize_base.py b/addons/sync_base/wizard/synchronize_base.py
index 8f49154f1b9..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 _