From f9bc6be1aca67fc59f1c286a82986f921240efc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Jun 2013 13:03:44 +0200
Subject: [PATCH] [CLEAN] Before merging: removed an added file not used;
 cleaned some debugging data; improved user form view to better separate
 email/login and messaging alias.

bzr revid: tde@openerp.com-20130621110344-zx2kxan47uctctka
---
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 addons/mail/mail_alias_view.xml               |  4 +++
 addons/mail/res_users_view.xml                | 31 ++++++++++++-------
 addons/portal_project/__openerp__.py          |  4 +--
 addons/portal_project/project_demo.xml        |  7 -----
 addons/project/project_demo.xml               |  3 +-
 7 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 addons/portal_project/project_demo.xml

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6f4948f9b71..eb1bbe451b4 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -348,7 +348,7 @@
                             <h1><field name="name" class="oe_inline"/></h1>
                         </div>
                         <group>
-                            <group name="left">
+                            <group name="job_data">
                                 <field name="no_of_employee" groups="base.group_user"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                                 <field name="expected_employees" groups="base.group_user"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 0f9e095986b..8662c02af29 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -316,7 +316,7 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="//group[@name='left']" position="after">
+            <xpath expr="//group[@name='job_data']" position="after">
                 <group name="group_alias"
                         attrs="{'invisible': [('alias_domain', '=', False)]}">
                     <label for="alias_name" string="Email Alias"/>
diff --git a/addons/mail/mail_alias_view.xml b/addons/mail/mail_alias_view.xml
index 6ef5973b094..1313cf303a3 100644
--- a/addons/mail/mail_alias_view.xml
+++ b/addons/mail/mail_alias_view.xml
@@ -38,6 +38,7 @@
                     <field name="alias_model_id"/>
                     <field name="alias_user_id"/>
                     <field name="alias_defaults"/>
+                    <field name="alias_contact"/>
                 </tree>
             </field>
         </record>
@@ -50,6 +51,9 @@
                 <search string="Search Alias">
                     <field name="alias_name"/>
                     <field name="alias_model_id"/>
+                    <field name="alias_force_thread_id"/>
+                    <field name="alias_parent_model_id"/>
+                    <field name="alias_parent_thread_id"/>
                     <separator/>
                     <filter string="Active" name="active" domain="[('alias_name', '!=', False)]"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 49edd56ee10..da16aa080c0 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,22 +27,31 @@
                     <field name="notification_email_send"/>
                 </field>
                 <field name="email" position="after">
-                    <label for="alias_id" string="Alias"/>
+                    <!-- <label for="alias_id" string="Alias" -->
+                            <!-- attrs="{'invisible': [('alias_domain', '=', False)]}"/> -->
                     <div name="group_alias"
-                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                            attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <!-- <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> -->
                         <div name="edit_alias" class="oe_edit_only">
-                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                            <!-- <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> -->
                         </div>
+                        <!-- <field name="alias_contact" string="Accept Emails From"/> -->
                     </div>
-                    <field name="alias_contact" string="Accept Emails From"/>
                 </field>
-                <group string="Email preferences" position="after">
-                    <group name="misc" string="Miscellaneous"
-                            groups="base.group_no_one">
-                        <field name="display_groups_suggestions"/>
-                    </group>
-                </group>
+                <field name="signature" position="before">
+                    <label for="alias_id" string="Messaging Alias" class="oe_read_only"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <field name="alias_id" class="oe_read_only" required="0" nolabel="1"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <label for="alias_name" string="Messaging Alias" class="oe_edit_only"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                    </div>
+                    <field name="alias_contact" string="Alias Accepts Emails From"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <field name="display_groups_suggestions" groups="base.group_no_one"/>
+                </field>
             </data>
             </field>
         </record>
diff --git a/addons/portal_project/__openerp__.py b/addons/portal_project/__openerp__.py
index 51238531619..8d24b4a2c84 100644
--- a/addons/portal_project/__openerp__.py
+++ b/addons/portal_project/__openerp__.py
@@ -36,9 +36,7 @@ This module adds project menu and features (tasks) to your portal if project and
         'security/ir.model.access.csv',
         'portal_project_view.xml',
     ],
-    'demo': [
-        'project_demo.xml',
-    ],
+    'demo': [],
     'installable': True,
     'auto_install': True,
     'category': 'Hidden',
diff --git a/addons/portal_project/project_demo.xml b/addons/portal_project/project_demo.xml
deleted file mode 100644
index f8642bce653..00000000000
--- a/addons/portal_project/project_demo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <!-- <data noupdate="1"> -->
-    <data>
-
-    </data>
-</openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 328f2d1da8a..b7e1524c2c8 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <!-- <data noupdate="1"> -->
-    <data>
+    <data noupdate="1">
 
         <!-- Users -->
         <record id="base.user_demo" model="res.users">