openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~ysa-openerp/openobject-addons/email-framework-addons into lp:~openerp-dev/openobject-addons/emails-framework-addons.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~ysa-openerp/openobject-addons/email-framework-addons/+merge/49780

Fix problems in email_template module.
-- 
https://code.launchpad.net/~ysa-openerp/openobject-addons/email-framework-addons/+merge/49780
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~ysa-openerp/openobject-addons/email-framework-addons into lp:~openerp-dev/openobject-addons/emails-framework-addons.

=== modified file 'email_template/wizard/email_template_send_wizard.py'
--- email_template/wizard/email_template_send_wizard.py	2011-02-15 09:23:44 +0000
+++ email_template/wizard/email_template_send_wizard.py	2011-02-15 10:39:22 +0000
@@ -35,7 +35,7 @@
         if context is None:
             context = {}
         result = super(email_template_send_wizard, self).default_get(cr, uid, fields, context=context)
-        
+
         template_pool = self.pool.get('email.template')
         model_pool = self.pool.get('ir.model')
         template_id=context.get('template_id', False)
@@ -52,7 +52,7 @@
             result['user_signature'] = template.user_signature
 
         if 'report_template' in fields:
-            result['report_template'] = template.report_template
+            result['report_template'] = template.report_template and template.report_template.id or False
 
         if 'template_id' in fields:
             result['template_id'] = template.id
@@ -74,7 +74,7 @@
 
         if 'state' in fields:
             result['state'] =  len(context.get('src_rec_ids','')) > 1 and 'multi' or 'single'
-  
+
         if 'model_id' in fields:
             result['model_id'] = model_pool.search(cr, uid, [('model','=',context.get('src_model'))],context=context)[0]
 
@@ -168,7 +168,7 @@
         #        return self.get_value(cr, uid, template, value, context, id)
         #    else:
         #        return value
-        
+
         email_ids = []
         for template in self.browse(cr, uid, ids, context=context):
             for record_id in context.get('src_rec_ids',[]):