Merge lp:~stefan-opener/therp-backports/addons61-lp939588-check_partner_category_id_is_not_list into lp:therp-backports/server-6.1

[Stefan Rijnhart (Opener)]

[Holger Brunn (Therp) (hbrunn)]

if you have a context like
{'category_id': [(6, 0, 42)]}
as you mention in your bug report, the condition you add evaluates to False.

Shouldn't it be
not context.get('category_id') or not isinstance(context['category_id'], (int, long))
?

review: Needs Fixing

[lp:~stefan-opener/therp-backports/addons61-lp939588-check_partner_category_id_is_not_list]

4301. By Stefan Rijnhart (Opener) on 2013-04-09

[FIX] Logical error found in review by Holger
[FIX] Mismatched parenthesis

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for saving me there! Fixed it.

[Holger Brunn (Therp) (hbrunn)]

review: Approve

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2012-04-10 14:41:38 +0000
+++ openerp/addons/base/res/res_partner.py	2013-04-09 12:57:19 +0000
@@ -279,7 +279,8 @@
     def view_header_get(self, cr, uid, view_id, view_type, context):
         res = super(res_partner, self).view_header_get(cr, uid, view_id, view_type, context)
         if res: return res
-        if (not context.get('category_id', False)):
+        if (not context.get('category_id') or not
+                isinstance(context['category_id'], (int, long))):
             return False
         return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name
     def main_partner(self, cr, uid):