Merge lp:~openerp-dev/openobject-addons/6.1-opw-574889-gpa into lp:openobject-addons/6.1

Proposed by gpa(OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 6804
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-574889-gpa
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+2/-0)
1 file modified
crm/wizard/ (+2/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-574889-gpa
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email:

Description of the change

Hello Sir,

[FIX] crm: When select leads and with wizard merge them error generated.

Steps to reproduce Error :
1. Select more than one lead from the list at Sales/Sales/Leads
2. Trigger the wizard "Merge Opportunities", then click "Merge"

Traceback generated

This branch fixes this issue.
Please review this branch.


To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

the propose patch will solve the traceback and pop up the related message.

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Naresh Soni

Unmerged revisions

6804. By gpa(OpenERP)

[FIX] crm :Solved the traceback when going to merge leads instead of opportunities with wizard Merge Opportunities: OPW:574889

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/wizard/'
2--- crm/wizard/ 2011-12-19 16:54:40 +0000
3+++ crm/wizard/ 2012-05-17 12:09:20 +0000
4@@ -52,6 +52,8 @@
5 opp_ids = []
6 opps = self.pool.get('crm.lead').browse(cr, uid, record_ids, context=context)
7 for opp in opps:
8+ if opp.type == 'lead':
9+ raise osv.except_osv(_('Warning !'),_('Leads can not be merge'))
10 if opp.state not in ('done', 'cancel'):
11 opp_ids.append(
12 if 'opportunity_ids' in fields: