From d6570bad4ef213cf330294d48848da05ec2cfdbb Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Wed, 21 Sep 2011 16:24:34 +0530 Subject: [PATCH] [Fix] Remove the conflicts bzr revid: dbr@tinyerp.com-20110921105434-gwdgjlww3plvuvoy --- addons/crm/test/test_crm_lead.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml index 7f5a5134369..1843fc6897d 100644 --- a/addons/crm/test/test_crm_lead.yml +++ b/addons/crm/test/test_crm_lead.yml @@ -145,26 +145,6 @@ self.action_add(cr, uid, [ref("crm_add_note0")],context) except: pass -- - I create send mail report. -- - !record {model: crm.send.mail, id: crm_send_mail0}: - {} -- - I close lead by click on "close" button. -- - !python {model: crm.send.mail}: | - fields = { - 'email_to': 'info@axelor.com', - 'email_from': 'Administrator ', - 'subject': 'latest', - 'body': 'test', - 'reply_to': 'sales_openerp@openerp.com', - 'state': 'draft' - } - self.default_get(cr, uid, fields, {'active_ids':[ref('crm_lead_newcustomer0')],'active_id':ref('crm_lead_newcustomer0'),'active_model':'crm.lead'}) - #self.action_mass_send(cr, uid, [ref('crm_send_mail0')], {'active_ids':[ref('crm_send_mail0')],'active_id':ref('crm_send_mail0')}) - self.get_reply_defaults(cr, uid, fields, {'active_ids':[ref('crm_send_mail0')],'active_id':ref('crm_send_mail0')}) - I close lead by click on "close" button. -