From 23940bec776dbcaeba3e63d24d6125bf3d02fcb0 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Mar 2013 14:16:22 +0100
Subject: [PATCH] [FIX] deactive social addition moved to
 trunk-social-aspects-mat

bzr revid: mat@openerp.com-20130320131622-58653m9ubpdovtvd
---
 addons/hr/__openerp__.py         |  1 -
 addons/hr/mail_hr_view.xml       | 24 ------------------------
 addons/mail/mail_thread_view.xml |  3 +--
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 addons/hr/mail_hr_view.xml

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b978a83e658..b4b8e982845 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -59,7 +59,6 @@ You can manage:
         'hr_installer.xml',
         'hr_data.xml',
         'res_config_view.xml',
-        'mail_hr_view.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
deleted file mode 100644
index 4e02076bd5d..00000000000
--- a/addons/hr/mail_hr_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
-            <field name="context">{
-              'default_model': 'hr.employee', 
-              'default_res_id': 0,
-              'res_users_id': uid,
-            }</field>
-            <field name="params" eval="&quot;{
-                'domain': [
-                  ('to_read', '=', True),
-                  ('starred', '=', False),
-                ],
-                'view_mailbox': True,
-                'view_inbox': True,
-                'read_action': 'read',
-                'show_compose_message': True
-            }&quot;"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 94af7459e7f..75c86e4645d 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -16,8 +16,7 @@
                 ],
                 'view_mailbox': True,
                 'view_inbox': True,
-                'read_action': 'read',
-                'show_compose_message': False
+                'read_action': 'read'
             }&quot;"/>
             <field name="help" type="html">
                 <p>