Harry (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-import-google-pso into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-import-google-pso/+merge/124123
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-import-google-pso/+merge/124123
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-import-google-pso.
=== modified file 'google_base_account/wizard/google_login.py'
--- google_base_account/wizard/google_login.py 2012-08-07 11:31:37 +0000
+++ google_base_account/wizard/google_login.py 2012-09-13 08:21:00 +0000
@@ -39,11 +39,12 @@
def google_login(self, user, password, type='', context=None):
if type == 'group':
gd_client = gdata.contacts.client.ContactsClient(source='OpenERP')
- if type == 'contact':
- gd_client = gdata.contacts.service.ContactsService()
- if type == 'calendar':
+ gd_client = gdata.contacts.service.ContactsService()
+ elif type == 'contact':
+ gd_client = gdata.contacts.service.ContactsService()
+ elif type == 'calendar':
gd_client = gdata.calendar.service.CalendarService()
- if type =='docs_client':
+ elif type =='docs_client':
gd_client = gdata.docs.client.DocsClient()
else:
gd_client = gdata.contacts.service.ContactsService()
=== modified file 'import_google/wizard/import_google.py'
--- import_google/wizard/import_google.py 2012-07-06 12:43:14 +0000
+++ import_google/wizard/import_google.py 2012-09-13 08:21:00 +0000
@@ -255,7 +255,7 @@
'email_from': 'Email',
'date': 'DateStart',
'date_deadline': 'DateEnd',
- 'categ_id/id': call(self.get_event_category, value('Category')),
+ 'categ_ids/id': call(self.get_event_category, value('Category')),
'recurrency': self.get_rec,
'end_date' : 'end_date',
'end_type' : 'end_type',
=== modified file 'import_google/wizard/import_google_data.py'
--- import_google/wizard/import_google_data.py 2012-08-07 11:34:14 +0000
+++ import_google/wizard/import_google_data.py 2012-09-13 08:21:00 +0000
@@ -110,6 +110,8 @@
_defaults = {
'group_name': 'all',
+ 'customer': True,
+ 'supplier': True,
}
def import_google(self, cr, uid, ids, context=None):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
