From 052f2ace57e20f06980bc8fadf37b32be1921420 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 26 Jun 2012 11:39:06 +0530
Subject: [ADD] mail: aded alias feature for users.

bzr revid: tpa@tinyerp.com-20120626060906-wn4sniccnw25e2nz
---
 addons/mail/mail_data.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'addons/mail/mail_data.xml')

diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index c8e8b1a488e..38e3b6a86cc 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -12,5 +12,18 @@
             <field eval="'process_email_queue'" name="function"/>
             <field eval="'()'" name="args"/>
         </record>
+		   
+        <record id="mail_alias_root_user" model="mail.alias">
+            <field name="alias_name">admin@openerp.my.openerp.com</field>
+            <field name="alias_model_id" ref="model_res_users"/>
+            <field name="alias_user_id" ref="base.user_root"/>
+            <field name="alias_force_thread_id" ref="base.user_root"/>
+            <field name="alias_defaults">{}</field>
+        </record>
+
+        <record model="res.users" id="base.user_root">
+            <field name="alias_id" ref="mail_alias_root_user"/>
+        </record>
+        
     </data>
 </openerp>
-- 
cgit v1.2.3


From 494acb39555fff2f18a3ff4669a41b68ab97c258 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 29 Jun 2012 14:16:21 +0530
Subject: [FIX] remove domain do nto store the domian

bzr revid: jam@tinyerp.com-20120629084621-bkt7d22ajtyqkb3g
---
 addons/mail/mail_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/mail_data.xml')

diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index 38e3b6a86cc..2448b89fcd6 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -14,7 +14,7 @@
         </record>
 		   
         <record id="mail_alias_root_user" model="mail.alias">
-            <field name="alias_name">admin@openerp.my.openerp.com</field>
+            <field name="alias_name">admin</field>
             <field name="alias_model_id" ref="model_res_users"/>
             <field name="alias_user_id" ref="base.user_root"/>
             <field name="alias_force_thread_id" ref="base.user_root"/>
-- 
cgit v1.2.3