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 @@
-
+
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)]}"/>
-
+
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 @@
+
@@ -50,6 +51,9 @@
+
+
+
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 @@
-
+
+
-
+ attrs="{'invisible': [('alias_domain', '=', False)]}">
+
- @
+
+
-
-
-
-
-
-
+
+
+
+
+
+ @
+
+
+
+
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 @@
-
-
-
-
-
-
-
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 @@
-
-
+