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

[gpa(OpenERP)]

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.

Thanks,
GPA

[Vinay Rana (OpenERP) (vra-openerp)]

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

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

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.

Thanks,
Naresh Soni

Unmerged revisions

6804. By gpa(OpenERP) on 2012-05-17

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

=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py	2011-12-19 16:54:40 +0000
+++ crm/wizard/crm_merge_opportunities.py	2012-05-17 12:09:20 +0000
@@ -52,6 +52,8 @@
             opp_ids = []
             opps = self.pool.get('crm.lead').browse(cr, uid, record_ids, context=context)
             for opp in opps:
+                if opp.type == 'lead':
+                    raise osv.except_osv(_('Warning !'),_('Leads can not be merge'))
                 if opp.state not in ('done', 'cancel'):
                     opp_ids.append(opp.id)
             if 'opportunity_ids' in fields: