From 44780cf09f2878287844741864073402e75a1181 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 28 Feb 2011 13:01:25 +0530 Subject: [PATCH 1/4] [IMP] sync_google_contact: Change field to improve import options. bzr revid: uco@tinyerp.com-20110228073125-edjop4meuo1x6xtu --- .../wizard/google_contact_import.py | 24 +++++++++---------- .../wizard/google_contact_import_view.xml | 2 +- 2 files changed, 13 insertions(+), 13 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..d2eb2015065 100644 --- a/addons/sync_google_contact/wizard/google_contact_import.py +++ b/addons/sync_google_contact/wizard/google_contact_import.py @@ -123,12 +123,12 @@ class synchronize_google_contact(osv.osv_memory): 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 "), + '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."), } _defaults = { - 'create_partner': True, + 'create_partner': 'create_all', 'group_name': _get_default_group, } @@ -141,7 +141,7 @@ class synchronize_google_contact(osv.osv_memory): return partner_id, data def import_contact(self, cr, uid, ids, context=None): - obj=self.browse(cr, uid, ids, context=context)[0] + obj = self.browse(cr, uid, ids, context=context)[0] if obj.group_name == 'none': return { 'type': 'ir.actions.act_window_close' } @@ -158,12 +158,12 @@ class synchronize_google_contact(osv.osv_memory): if obj.group_name not in ['all','none']: query = gdata.contacts.service.ContactsQuery() - query.group =obj.group_name + query.group = obj.group_name contact = gd_client.GetContactsFeed(query.ToUri()) else: contact = gd_client.GetContactsFeed() - ids = self.create_contact( cr, uid, gd_client,contact, partner_id=obj.create_partner,context=context) + ids = self.create_contact(cr, uid, gd_client, contact, option=obj.create_partner,context=context) if not ids: return {'type': 'ir.actions.act_window_close'} @@ -179,7 +179,7 @@ class synchronize_google_contact(osv.osv_memory): } - def create_contact(self, cr, uid, gd_client,contact, partner_id=False,context=None): + def create_contact(self, cr, uid, gd_client, contact, option,context=None): model_obj = self.pool.get('ir.model.data') addresss_obj = self.pool.get('res.partner.address') addresses = [] @@ -230,7 +230,7 @@ class synchronize_google_contact(osv.osv_memory): #create or link to an existing partner only if it's a new contact res_id = addresss_obj.create(cr, uid, data, context=context) data['address_id'] = res_id - if partner_id: + if option == 'create_all': partner_id, data = self.create_partner(cr, uid, data, context=context) partner_ids.append(partner_id[0]) addresses.append(res_id) @@ -240,15 +240,15 @@ class synchronize_google_contact(osv.osv_memory): next = contact.GetNextLink() contact = next and gd_client.GetContactsFeed(next.href) or None - if partner_id: + if option == 'create_all': return partner_ids else: return addresses - def update_contact(self, cr, uid, contact_ids, data,context=None): + def update_contact(self, cr, uid, contact_ids, data, context=None): addresss_obj = self.pool.get('res.partner.address') - if context==None: - context={} + if context == None: + context = {} res = {} addr = addresss_obj.browse(cr,uid,contact_ids)[0] name = str((addr.name or addr.partner_id and addr.partner_id.name or '').encode('utf-8')) 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..be4033b734c 100644 --- a/addons/sync_google_contact/wizard/google_contact_import_view.xml +++ b/addons/sync_google_contact/wizard/google_contact_import_view.xml @@ -9,7 +9,7 @@
- + From 662cc9202b4e80e448010b5f86a0e331efa0b881 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 28 Feb 2011 14:25:20 +0530 Subject: [PATCH 2/4] [IMP] : Usability improvements. bzr revid: uco@tinyerp.com-20110228085520-kr83h7cbqvyzkn66 --- addons/google_base_account/google_base_account.py | 2 +- addons/google_base_account/wizard/google_login.py | 2 +- addons/sync_base/wizard/sync_base_view.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py index c1642730e24..98596fe77ca 100644 --- a/addons/google_base_account/google_base_account.py +++ b/addons/google_base_account/google_base_account.py @@ -24,7 +24,7 @@ from osv import fields,osv,orm class res_users(osv.osv): _inherit = "res.users" _columns = { - 'gmail_user': fields.char('User Name', size=64,), + 'gmail_user': fields.char('Google Account', size=64,), 'gmail_password': fields.char('Password', size=64), } res_users() diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py index 8db6fa85258..5e9e3c43335 100644 --- a/addons/google_base_account/wizard/google_login.py +++ b/addons/google_base_account/wizard/google_login.py @@ -30,7 +30,7 @@ class google_login(osv.osv_memory): _description ='Google Contact' _name = 'google.login' _columns = { - 'user': fields.char('User Name', size=64, required=True), + 'user': fields.char('Username', size=64, required=True), 'password': fields.char('Password', size=64), } diff --git a/addons/sync_base/wizard/sync_base_view.xml b/addons/sync_base/wizard/sync_base_view.xml index c957993fe67..1f8b16b94f6 100644 --- a/addons/sync_base/wizard/sync_base_view.xml +++ b/addons/sync_base/wizard/sync_base_view.xml @@ -14,7 +14,7 @@