Merge lp:~openerp-commiter/openobject-server/trunk-bug-1000186-rma into lp:openobject-server

[Randhir Mayatra (OpenERP)]

Hello,
Merge Proposal contains bug fix of lp:1000186 ;trace-back when Subscribe partner.

Steps to reproduce a problem:
---------------------------
- Install event, sale module
- Go to Sale Order form View.
- Click to Partner which will redirect you to Partner form view.
- Go to More (dropdown), Click Subscribe, which will give you traceback.

Kindly review this.
Thank You

Unmerged revisions

4158. By Randhir Mayatra (OpenERP) <email address hidden> on 2012-05-18

[FIX] base : subscribe shortcut gives tracebake on res_partner

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2012-04-23 10:23:13 +0000
+++ openerp/addons/base/res/res_partner.py	2012-05-18 07:10:25 +0000
@@ -385,7 +385,10 @@
         if res: return res
         if (not context.get('category_id', False)):
             return False
-        return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name
+        catg_id = context['category_id']
+        if isinstance((catg_id),(list,tuple)):
+           catg_id = catg_id[0]
+        return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, catg_id, context).name
 
     def main_partner(self, cr, uid):
         ''' Return the id of the main partner