From 3519e2c19f90002555163c7bae1bd07e14510e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Apr 2013 18:01:39 +0200
Subject: [IMP] project, task, issues: improvement of ir rules. Still a bit
 WIP.

bzr revid: tde@openerp.com-20130410160139-vx9z4rsmfiji1vu9
---
 addons/project/project_demo.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'addons/project/project_demo.xml')

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f5fbf878fd0..42671c43002 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <!-- <data noupdate="1"> -->
+    <data>
 
         <!-- Users -->
         <record id="base.user_demo" model="res.users">
@@ -29,7 +30,7 @@
             <field name="color">3</field>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="privacy_visibility">public</field>
+            <field name="visibility">public</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
@@ -46,9 +47,12 @@
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="privacy_visibility">public</field>
+            <field name="visibility">followers</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
+            <field name="message_follower_ids" eval="[(6, 0, [
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
         </record>
 
         <!-- We assign after so that default values applies -->
@@ -62,7 +66,7 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="privacy_visibility">public</field>
+            <field name="visibility">public</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
         </record>
 
@@ -75,6 +79,7 @@
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
+            <field name="visibility">followers</field>
             <field name="alias_model">project.task</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
         </record>
@@ -89,6 +94,7 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
+            <field name="visibility">employees</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
-- 
cgit v1.2.3


From c7897690e2aafa74649297d06a7f9f538bd15661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 16 Apr 2013 15:39:36 +0200
Subject: [REF] project: removed duplicate files introduced when merging 7 into
 branch, because of backport of some modifications done in this branch in 7

bzr revid: tde@openerp.com-20130416133936-cr0sno29vk5dyj0e
---
 addons/project/project_demo.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/project/project_demo.xml')

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 42671c43002..aa0f2c3aae8 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -30,7 +30,7 @@
             <field name="color">3</field>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="visibility">public</field>
+            <field name="privacy_visibility">public</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
@@ -47,7 +47,7 @@
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="visibility">followers</field>
+            <field name="privacy_visibility">followers</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="message_follower_ids" eval="[(6, 0, [
@@ -66,7 +66,7 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="visibility">public</field>
+            <field name="privacy_visibility">public</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
         </record>
 
@@ -79,7 +79,7 @@
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="visibility">followers</field>
+            <field name="privacy_visibility">followers</field>
             <field name="alias_model">project.task</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
         </record>
@@ -94,7 +94,7 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
-            <field name="visibility">employees</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
-- 
cgit v1.2.3


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: [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/project/project_demo.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/project/project_demo.xml')

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">
-- 
cgit v1.2.3