Merge lp:~openerp-dev/openobject-addons/trunk-bug-1024627-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

     Fix the issue of importing google calender.

Thanks,
 NCO.

[Atul Patel(OpenERP) (atp-openerp)]

review: Approve

[Antony Lesuisse (OpenERP) (al-openerp)]

Module moved to openerp-extra
https://code.launchpad.net/openerp-extra

Unmerged revisions

7355. By Nimesh Contractor(Open ERP) on 2012-09-05

[FIX] fix the issue of importing google calender.

=== 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-05 06:45:29 +0000
@@ -41,10 +41,10 @@
             gd_client = gdata.contacts.client.ContactsClient(source='OpenERP')
         if type == 'contact':
             gd_client = gdata.contacts.service.ContactsService()
+        if type =='docs_client':
+            gd_client = gdata.docs.client.DocsClient()
         if type == 'calendar':
             gd_client = gdata.calendar.service.CalendarService()
-        if type =='docs_client':
-            gd_client = gdata.docs.client.DocsClient()
         else:
             gd_client = gdata.contacts.service.ContactsService()
         try:
 
=== 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-05 06:45:29 +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',