Merge lp:~openerp-dev/openobject-addons/6.1-opw-580212-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

When no Internal Type is defined in the Meeting.

And User is trying to get detail of Invitation it throws error due name field passes None Value.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not reproducible on Trunk. If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7028. By Dhruti Shastri(OpenERP) on 2012-10-15

[FIX][crm] : Invitations Detail Error

=== modified file 'crm/crm_meeting.py'
--- crm/crm_meeting.py	2011-10-16 01:28:00 +0000
+++ crm/crm_meeting.py	2012-10-15 06:04:25 +0000
@@ -119,7 +119,9 @@
             result[id] = {}
             if name == 'categ_id':
                 if attdata.ref and 'categ_id' in attdata.ref._columns:
-                    result[id][name] = (attdata.ref.categ_id.id, attdata.ref.categ_id.name,)
+                    # Throws TypeError: cannot marshal None unless allow_none (if categ_id is False,None)
+                    if attdata.ref.categ_id.id:
+                        result[id][name] = (attdata.ref.categ_id.id, attdata.ref.categ_id.name,)
                 else:
                     result[id][name] = False
        return result