From 013af8477f5c429d9205c221304562aa1b2a6eab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 21 Dec 2012 20:56:14 +0100
Subject: [PATCH] [IMP] mail serveur active

bzr revid: fp@tinyerp.com-20121221195614-pfk4kbmquzmhrgbc
---
 openerp/addons/base/base_data.xml        | 9 ++++++++-
 openerp/addons/base/currency_data.xml    | 8 --------
 openerp/addons/base/ir/ir_mail_server.py | 2 ++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 2cf7d00600e..2922dd82dc4 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -89,6 +89,13 @@ Administrator</field>
         <record id="EUR" model="res.currency">
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
+        <record id="ir_mail_server_localhost0" model="ir.mail_server">
+            <field name="name">localhost</field>
+            <field name="smtp_host">localhost</field>
+            <field eval="25" name="smtp_port"/>
+            <field eval="10" name="sequence"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/currency_data.xml
index 0009b6ae95c..8a3661f5fd2 100644
--- a/openerp/addons/base/currency_data.xml
+++ b/openerp/addons/base/currency_data.xml
@@ -510,14 +510,6 @@
            <field name="currency_id" ref="CRC"/>
            <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-
-        <record id="ir_mail_server_localhost0" model="ir.mail_server">
-            <field name="name">localhost</field>
-            <field name="smtp_host">localhost</field>
-            <field eval="25" name="smtp_port"/>
-            <field eval="10" name="sequence"/>
-	    </record>
-
         <record id="MUR" model="res.currency">
             <field name="name">MUR</field>
             <field name="symbol">Rs</field>
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 0134cd5f197..e19742869ca 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -182,10 +182,12 @@ class ir_mail_server(osv.osv):
                                                        "(this is very verbose and may include confidential info!)"),
         'sequence': fields.integer('Priority', help="When no specific mail server is requested for a mail, the highest priority one "
                                                     "is used. Default priority is 10 (smaller number = higher priority)"),
+        'active': fields.boolean('Active')
     }
 
     _defaults = {
          'smtp_port': 25,
+         'active': True,
          'sequence': 10,
          'smtp_encryption': 'none',
      }