From 674f3d794ea445f2c0671468fd352fcd5f9806a5 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 27 Sep 2011 19:20:15 +0200 Subject: [PATCH] [FIX] crm: fix wizards for proper inheritance bzr revid: odo@openerp.com-20110927172015-qoeaund7u2knrct5 --- addons/crm/test/test_crm_lead.yml | 2 -- addons/crm/wizard/crm_lead_to_opportunity.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml index 6a954939e04..5e9b7a5cfca 100644 --- a/addons/crm/test/test_crm_lead.yml +++ b/addons/crm/test/test_crm_lead.yml @@ -92,7 +92,6 @@ - !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}: action: 'exist' - name: 'existing partner' - Then, Click on "Create Opportunity" button. - @@ -104,7 +103,6 @@ - !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}: action: 'nothing' - name: 'Do not link to a partner' - Then, Click on "Create Opportunity" button. - diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 8200dbd1675..87ab9229d26 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -37,7 +37,7 @@ class crm_lead2opportunity_partner(osv.osv_memory): ('nothing', 'Do not link to a partner')], \ 'Action', required=True), 'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True), - 'opportunity_ids': fields.many2many('crm.lead', 'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]), + 'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]), } def default_get(self, cr, uid, fields, context=None): @@ -236,7 +236,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory): _columns = { - 'user_ids': fields.many2many('res.users', 'mass_convert_rel', 'user_id', 'wizard_id', 'Salesmans'), + 'user_ids': fields.many2many('res.users', string='Salesmans'), 'section_id': fields.many2one('crm.case.section', 'Sales Team'), }