From 8a351d8ee860701573e7e6f1a2fcdef34b607e55 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 29 Jun 2012 12:50:39 +0530
Subject: [PATCH 1/2] [IMP] crm: improved view and code

bzr revid: tpa@tinyerp.com-20120629072039-xqckkz4tzok87fu4
---
 addons/crm/crm_demo.xml | 16 +++++++++-------
 addons/crm/crm_view.xml |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 1e5d837f818..3f495099365 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+        <record id="mail_alias_marketing_department" model="mail.alias">
+            <field name="alias_name">info@openerp.my.openerp.com</field>
+            <field name="alias_model_id" ref="model_crm_lead"/>
+            <field name="alias_user_id" ref="base.user_root"/>
+            <field name="alias_defaults">{'type':'lead'}</field>
+        </record>
+    </data>
+
     <data>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
@@ -12,13 +21,6 @@
         <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
     </record>
 
-    <record id="mail_alias_marketing_department" model="mail.alias">
-        <field name="alias_name">info@openerp.my.openerp.com</field>
-        <field name="alias_model_id" ref="model_crm_lead"/>
-        <field name="alias_user_id" ref="base.user_root"/>
-        <field name="alias_defaults">{'type':'lead'}</field>
-    </record>
-    
     <record model="crm.case.section" id="section_sales_marketing_department">
             <field name="name">Sales Marketing Department</field>
             <field name="code">Sales Marketing</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index d0e1ff72344..d79c09034cf 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -71,12 +71,12 @@
                             <field name="name" colspan="2"/>
                             <field name="parent_id"/>
                             <field name="code"/>
+                            <field name="alias_id" required="0"/>
                         </group>
                         <group>
                             <field name="user_id"/>
                             <field name="resource_calendar_id"/>
                             <field name="active"/>
-                            <field name="alias_id" required="0" />
                         </group>
                     </group>
                     <notebook colspan="4">

From e461bc1b7cf603ff3660a559b311f1b31bec95c5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 29 Jun 2012 14:18:33 +0530
Subject: [PATCH 2/2] [ADD] added access rigts for mail.alias

bzr revid: tpa@tinyerp.com-20120629084833-sjjsvf0wnc7xh1by
---
 addons/mail/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 011e8b27dc5..a675c009bdd 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -5,3 +5,4 @@ access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
 access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
 access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
+access_mail_alias,mail.alias,model_mail_alias,base.group_user,1,1,1,0