From 1ae74e8907ea90d383753f0f9ee2c8256a783d3c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 14 Jun 2013 11:44:39 +0200
Subject: [PATCH] [FIX] mail: default value for email_reply_to variable (merge
 messup)

bzr revid: chs@openerp.com-20130614094439-iqji8aimvaf4x5t6
---
 addons/mail/mail_mail.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 24fa7e9a1d1..5263fb127b1 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -90,6 +90,7 @@ class mail_mail(osv.Model):
         if values.get('reply_to'):
             return values.get('reply_to')
         format_name = True  # whether to use a 'Followers of Pigs <pigs@openerp.com' format
+        email_reply_to = None
 
         ir_config_parameter = self.pool.get("ir.config_parameter")
         catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)