From 8692fbcc103bcd1617aab0ad402af6858cb5026b Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Mon, 14 Feb 2011 13:03:46 +0530
Subject: [PATCH] [IMP] sync_google_contact: improve contact wizard

bzr revid: sbh@tinyerp.com-20110214073346-wbenzus1eqdqomrw
---
 addons/sync_base/__init__.py                             | 3 ++-
 addons/sync_google_contact/__openerp__.py                | 2 +-
 addons/sync_google_contact/wizard/__init__.py            | 2 +-
 .../sync_google_contact/wizard/google_contact_import.py  | 9 ++++++---
 .../wizard/google_contact_import_view.xml                | 8 ++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/sync_base/__init__.py b/addons/sync_base/__init__.py
index e68279cad8d..2bad42af76c 100644
--- a/addons/sync_base/__init__.py
+++ b/addons/sync_base/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
-
+import sync_base
+import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sync_google_contact/__openerp__.py b/addons/sync_google_contact/__openerp__.py
index 9a46c53d2f3..5cb6ff4f436 100644
--- a/addons/sync_google_contact/__openerp__.py
+++ b/addons/sync_google_contact/__openerp__.py
@@ -31,7 +31,7 @@
     'init_xml': [],
     'update_xml': [
                   #'google_contact_view.xml',
-                  #'wizard/google_contact_import_view.xml'
+                  'wizard/google_contact_import_view.xml'
                    ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/sync_google_contact/wizard/__init__.py b/addons/sync_google_contact/wizard/__init__.py
index 8adb76f5152..a7356cede9e 100644
--- a/addons/sync_google_contact/wizard/__init__.py
+++ b/addons/sync_google_contact/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-#import google_contact_import
+import google_contact_import
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sync_google_contact/wizard/google_contact_import.py b/addons/sync_google_contact/wizard/google_contact_import.py
index f392148d15f..db22cd44a04 100644
--- a/addons/sync_google_contact/wizard/google_contact_import.py
+++ b/addons/sync_google_contact/wizard/google_contact_import.py
@@ -28,16 +28,19 @@ class google_contact_import(osv.osv_memory):
     _name = "synchronize.base"    
     _inherit = 'synchronize.base'
     _columns = {
-        'tools':  fields.selection([('gmail','Gmail')], 'App to synchronize with'),
-        'create_partner':fields.selection([('group','Group'),('email_address','Email address'),('gmail_user','Gmail user')], ''),
+        'tools':  fields.selection([('gmail','Gmail')],'Tools'),
+        'create_partner':fields.selection([('group','Group'),('email_address','Email address'),('gmail_user','Gmail user')], 'Create Partner'),
      }
         
     def import_contact(self, cr, uid, ids, context=None):
         # Only see the result, we will change the code
         
         addresss_obj = self.pool.get('res.partner.address')
+        user_obj=self.pool.get('res.users').browse(cr, uid, uid)
+        gmail_user=user_obj.gmail_user
+        gamil_pwd=user_obj.gmail_password
         for obj in self.browse(cr, uid, ids, context=context):
-            google_obj = sync_google_contact.google_lib(obj.user, obj.password)
+            google_obj = sync_google_contact.google_lib(gmail_user, gamil_pwd)
             contact = google_obj._get_contact()
             addresses = []
             while contact:
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 4bdf056bd5f..af2c575a080 100644
--- a/addons/sync_google_contact/wizard/google_contact_import_view.xml
+++ b/addons/sync_google_contact/wizard/google_contact_import_view.xml
@@ -3,12 +3,12 @@
     <data>
     
         <record model="ir.ui.view" id="view_google_contact_import_form">
-            <field name="name">google.contact.import.form</field>
-            <field name="model">google.contact.import</field>
+            <field name="name">synchronize.base.import.form</field>
+            <field name="model">synchronize.base</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Contacts">
-	                <group colspan="4" col="4">
+	                <group colspan="2" col="2">
 	                    <field name="tools"/>
 	                    <field name="create_partner" />
 	                </group>
@@ -24,7 +24,7 @@
         <record model="ir.actions.act_window" id="act_google_contact_import_form">
           <field name="name">Import Google Contacts</field>
           <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.contact.import</field>
+          <field name="res_model">synchronize.base</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>
           <field name="target">new</field>