From fdebb2b740f2338145795b103b476002771fb957 Mon Sep 17 00:00:00 2001
From: Denis Baranov <baranov@itlibertas.com>
Date: Thu, 28 Apr 2016 19:46:41 +0300
Subject: [PATCH] mail_fix_553: add name in from alias email

---
 mail_fix_553/README.rst      | 1 +
 mail_fix_553/data.xml        | 5 +++++
 mail_fix_553/mail_fix_553.py | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/mail_fix_553/README.rst b/mail_fix_553/README.rst
index bfb1799..f8a430f 100644
--- a/mail_fix_553/README.rst
+++ b/mail_fix_553/README.rst
@@ -18,6 +18,7 @@ Configuration
 =============
 
 You can configure default alias at Settings -> System Parameters -> mail.catchall.alias_from
+You can configure name for default alias at Settings -> System Parameters -> mail.catchall.name_alias_from
 
 Known issues / Roadmap
 ======================
diff --git a/mail_fix_553/data.xml b/mail_fix_553/data.xml
index 411d614..e9dc78d 100644
--- a/mail_fix_553/data.xml
+++ b/mail_fix_553/data.xml
@@ -6,5 +6,10 @@
             <field name="key">mail.catchall.alias_from</field>
             <field name="value">portal</field>
         </record>
+        <!-- Name for Catchall Email Alias -->
+        <record id="icp_mail_catchall_name_alias_from" model="ir.config_parameter">
+            <field name="key">mail.catchall.name_alias_from</field>
+            <field name="value">Odoo</field>
+        </record>
     </data>
 </openerp>
diff --git a/mail_fix_553/mail_fix_553.py b/mail_fix_553/mail_fix_553.py
index 167435a..70af917 100644
--- a/mail_fix_553/mail_fix_553.py
+++ b/mail_fix_553/mail_fix_553.py
@@ -38,6 +38,7 @@ class mail_mail(osv.Model):
 
         # NEW STUFF
         catchall_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.alias_from", context=context)
+        catchall_alias_name = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.name_alias_from", context=context)
         catchall_domain = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.domain", context=context)
 
         correct_email_from = '@%s>?\s*$'%catchall_domain
@@ -101,6 +102,8 @@ class mail_mail(osv.Model):
                     email_from = mail.email_from
                     if re.search(correct_email_from, email_from) is None:
                         email_from = default_email_from
+                    if catchall_alias_name:
+                        email_from = formataddr((catchall_alias_name, email_from))
 
                     msg = ir_mail_server.build_email(
                         email_from=email_from, # NEW STUFF