From 2982257521897f9a2bff110def0d324188145126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Sep 2013 17:18:22 +0200
Subject: [PATCH] [IMP] mail: added catchall and bounce aliases to config

bzr revid: tde@openerp.com-20130910151822-jg78ff0fojjqdiwj
---
 addons/mail/res_config.py       | 33 ++++++++++++++++++++++++++++++---
 addons/mail/res_config_view.xml |  8 ++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index c19eb4a38ee..750c82d54ba 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -28,9 +28,18 @@ class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'alias_domain': fields.char('Alias Domain',
-                                     help="If you have setup a catch-all email domain redirected to "
-                                          "the OpenERP server, enter the domain name here."),
+        'alias_domain': fields.char(
+            'Alias Domain',
+            help="If you have setup a catch-all email domain redirected to the OpenERP server, enter the domain name here."
+        ),
+        'alias_bounce': fields.char(
+            'Return-Path for Emails',
+            help="Return-Path of send Emails. Used to compute bounced emails.",
+        ),
+        'alias_catchall': fields.char(
+            'Default Alias',
+            help='Default email alias',
+        ),
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
@@ -47,3 +56,21 @@ class project_configuration(osv.TransientModel):
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
             config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
+
+    def get_default_alias_bounce(self, cr, uid, ids, context=None):
+        alias_bounce = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.bounce.alias", context=context)
+        return {'alias_bounce': alias_bounce}
+
+    def set_alias_bounce(self, cr, uid, ids, context=None):
+        config_parameters = self.pool.get("ir.config_parameter")
+        for record in self.browse(cr, uid, ids, context=context):
+            config_parameters.set_param(cr, uid, "mail.bounce.alias", record.alias_bounce or '', context=context)
+
+    def get_default_alias_catchall(self, cr, uid, ids, context=None):
+        alias_catchall = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.alias", context=context)
+        return {'alias_catchall': alias_catchall}
+
+    def set_alias_catchall(self, cr, uid, ids, context=None):
+        config_parameters = self.pool.get("ir.config_parameter")
+        for record in self.browse(cr, uid, ids, context=context):
+            config_parameters.set_param(cr, uid, "mail.catchall.alias", record.alias_catchall or '', context=context)
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index d3797ba2dcc..440cf358e47 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -11,6 +11,14 @@
                         <label for="alias_domain" class="oe_inline"/>
                         <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
                     </div>
+                    <div>
+                        <label for="alias_bounce" class="oe_inline"/>
+                        <field name="alias_bounce" placeholder="bounce" class="oe_inline"/>
+                    </div>
+                    <div>
+                        <label for="alias_catchall" class="oe_inline"/>
+                        <field name="alias_catchall" placeholder="catchall" class="oe_inline"/>
+                    </div>
                 </xpath>
             </field>
         </record>