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

Proposed by Randhir Mayatra (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-commiter/openobject-server/trunk-bug-1000186-rma
Merge into: lp:openobject-server
Diff against target: 15 lines (+4/-1)
1 file modified
openerp/addons/base/res/res_partner.py (+4/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-server/trunk-bug-1000186-rma
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+106318@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Unmerged revisions

4158. By Randhir Mayatra (OpenERP) <email address hidden>

[FIX] base : subscribe shortcut gives tracebake on res_partner

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
385 if res: return res385 if res: return res
386 if (not context.get('category_id', False)):386 if (not context.get('category_id', False)):
387 return False387 return False
388 return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name388 catg_id = context['category_id']
389 if isinstance((catg_id),(list,tuple)):
390 catg_id = catg_id[0]
391 return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, catg_id, context).name
389392
390 def main_partner(self, cr, uid):393 def main_partner(self, cr, uid):
391 ''' Return the id of the main partner394 ''' Return the id of the main partner