From 2242376b8bb295f282ac2d7e1f798705e9df01a7 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 2 Jul 2010 17:12:14 +0200 Subject: [PATCH] [IMP] marketing_campaign: remove unneeded _inherit bzr revid: chs@openerp.com-20100702151214-rfj6it5rr053hpem --- addons/marketing_campaign/marketing_campaign.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index dbb547af410..3b72f183f89 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -666,7 +666,7 @@ class marketing_campaign_workitem(osv.osv): 'type': 'ir.actions.act_window', 'target': 'new', 'nodestroy':True, - 'context': "{'template_id':%d,'rel_model_ref':%d}"% + 'context': "{'template_id':%d,'default_rel_model_ref':%d}"% (wi_obj.activity_id.email_template_id.id, wi_obj.res_id) } @@ -691,21 +691,6 @@ class email_template(osv.osv): } email_template() -class email_template_preview(osv.osv_memory): - _inherit = "email_template.preview" - - def _default_rel_model(self, cr, uid, context=None): - if 'rel_model_ref' in context : - return context['rel_model_ref'] - else : - return False - - _defaults = { - 'rel_model_ref' : _default_rel_model - } - -email_template_preview() - class report_xml(osv.osv): _inherit = 'ir.actions.report.xml' def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):