diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
| commit | 0fd2e8ea33af1bccf6dfa0351efccaa5696bd01d (patch) | |
| tree | 0a88a3b07e3148c71bb08e51d69793f4b7cafb97 /addons/import_google/wizard | |
| parent | 75e1bf1787385187b66a3a0b34d223b8685fd511 (diff) | |
| parent | a5819a49d297bf5f6c4bab83485f9bc7600c7e75 (diff) | |
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk
Diffstat (limited to 'addons/import_google/wizard')
| -rw-r--r-- | addons/import_google/wizard/import_google.py | 1 | ||||
| -rw-r--r-- | addons/import_google/wizard/import_google_data.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py index 936a6d17649..f241fabf412 100644 --- a/addons/import_google/wizard/import_google.py +++ b/addons/import_google/wizard/import_google.py @@ -51,7 +51,6 @@ class google_import(import_framework): def initialize(self): google = self.obj.pool.get('google.login') - self.external_id_field = 'Id' self.gd_client = google.google_login(self.context.get('user'), self.context.get('password'), self.context.get('instance')) diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py index d87af3dd69d..4e16c039742 100644 --- a/addons/import_google/wizard/import_google_data.py +++ b/addons/import_google/wizard/import_google_data.py @@ -100,8 +100,8 @@ class synchronize_google(osv.osv_memory): '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", size=32,help="Choose which group to import, By default it takes all."), - 'calendar_name': fields.selection(_get_calendars, "Calendar Name", size=32), + 'group_name': fields.selection(_get_group, "Group Name",help="Choose which group to import, By default it takes all."), + 'calendar_name': fields.selection(_get_calendars, "Calendar Name"), } _defaults = { |