From 9fa150527fa9dd00b47c5b04ca0bdd0935ed51b5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 29 Jun 2012 13:13:30 +0200 Subject: [IMP] import_google: removed option to create only addresses (it's same object now) bzr revid: qdp-launchpad@openerp.com-20120629111330-o5d15s49q27x7rh8 --- addons/import_google/wizard/import_google_data.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'addons/import_google/wizard/import_google_data.py') diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py index 9affc13899e..b3b35893e2f 100644 --- a/addons/import_google/wizard/import_google_data.py +++ b/addons/import_google/wizard/import_google_data.py @@ -102,7 +102,6 @@ class synchronize_google(osv.osv_memory): return res _columns = { - '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",help="Choose which group to import, By default it takes all."), @@ -110,7 +109,6 @@ class synchronize_google(osv.osv_memory): } _defaults = { - 'create_partner': 'create_all', 'group_name': 'all', } @@ -138,8 +136,7 @@ class synchronize_google(osv.osv_memory): raise osv.except_osv(_('Error'), _("Please specify correct user and password !")) if obj.group_name not in ['all']: context.update({ 'group_name': obj.group_name}) - if obj.create_partner=='create_all': - tables.append('Contact') + tables.append('Contact') else: tables.append('Address') context.update({'user': gmail_user, -- cgit v1.2.3 From 17aa1cbddeeafa2ae4fe7e0d78ebd1c6e45d22af Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 29 Jun 2012 13:20:11 +0200 Subject: [IMP] import_google: improved information message bzr revid: qdp-launchpad@openerp.com-20120629112011-fd5aoevje7f8m17t --- addons/import_google/wizard/import_google_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/import_google/wizard/import_google_data.py') diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py index b3b35893e2f..ef65c1a34c8 100644 --- a/addons/import_google/wizard/import_google_data.py +++ b/addons/import_google/wizard/import_google_data.py @@ -130,7 +130,7 @@ class synchronize_google(osv.osv_memory): raise osv.except_osv(_('Error'), _("Invalid login detail !\n Specify Username/Password.")) if context.get('contact'): - msg = " You're Contact are import in background, a email will be send when the process is finished to %s"%(user_obj.gmail_user) + msg = " Your contacts are being imported in background, an email to %s will be sent when the process is over" % (user_obj.gmail_user) gd_client = google.google_login(gmail_user, gmail_pwd, type='contact') if not gd_client: raise osv.except_osv(_('Error'), _("Please specify correct user and password !")) -- cgit v1.2.3 From a642b36339ac6628b1a937bbf0d2750cc14fcdd5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 29 Jun 2012 13:22:48 +0200 Subject: [FIX] import_google: fixed syntax error inserted in revision 6952 bzr revid: qdp-launchpad@openerp.com-20120629112248-9agiwb4l89lrx4li --- addons/import_google/wizard/import_google_data.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'addons/import_google/wizard/import_google_data.py') diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py index ef65c1a34c8..49127b85db8 100644 --- a/addons/import_google/wizard/import_google_data.py +++ b/addons/import_google/wizard/import_google_data.py @@ -137,8 +137,6 @@ class synchronize_google(osv.osv_memory): if obj.group_name not in ['all']: context.update({ 'group_name': obj.group_name}) tables.append('Contact') - else: - tables.append('Address') context.update({'user': gmail_user, 'password': gmail_pwd, 'instance': 'contact', -- cgit v1.2.3