[MERGE] upgraded to v6.0.0-RC1

bzr revid: ls@numerigraphe.fr-20101025084446-w4pv2twvms9zlyxx

1 files changed, 14 insertions, 23 deletions

diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index 77c80b078d1..ef829b6e258 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -9,29 +9,22 @@
     </record>
     
     <record model="document.storage" id="storage_default">
-	<field name="name">Default File storage</field>
-	<field name="user_id" ref="base.user_admin"/>
-    </record>
-
-    <record model="document.storage" id="storage_db">
-	<field name="name">DB storage</field>
-	<field name="user_id" ref="base.user_admin"/>
-	<field name="type" eval="'db'" />
-	<field name="path"></field>
+        <field name="name">Database storage</field>
+        <field name="type">db</field>
+        <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record model="document.directory" id="dir_root">
         <field name="name">Documents</field>
-        <field name="user_id" ref="base.user_admin"/>
-	<field name="storage_id" ref="storage_default"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
     </record>
 
     <record model="document.directory" id="dir_my_folder">
         <field name="name">My Folder</field>
         <field name="parent_id" ref="dir_root"/>
-        <field name="user_id" ref="base.user_admin"/>
-	<field name="storage_id" ref="storage_default"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="ressource_id">0</field>
  
     </record>
@@ -41,11 +34,10 @@
         <field name="parent_id" ref="dir_root"/>
         <field name="type">ressource</field>
         <field name="ressource_tree">1</field>
-	<field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
 
         <field name="ressource_type_id" search="[('model','=','res.partner.category')]" />
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
     </record>
 
     <record model="document.directory" id="dir_partner">
@@ -54,16 +46,15 @@
         <field name="domain">[('category_id','in',[active_id])]</field>
         <field name="ressource_type_id" search="[('model','=','res.partner')]" />
         <field name="ressource_parent_type_id" search="[('model','=','res.partner.category')]" />
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="ressource_id">0</field>
 
     </record>
 
     <record model="document.directory" id="dir_personnal_folder">
-        <field name="name">Personnal Folders</field>
+        <field name="name">Personal Folders</field>
         <field name="parent_id" ref="dir_root"/>
         <field name="type">ressource</field>
-	<field name="storage_id" ref="storage_default"/>
         <field name="ressource_type_id" ref="base.model_res_users" />
         <field name="ressource_id">0</field>
 
@@ -71,7 +62,7 @@
 
     <record model="document.directory" id="dir_product">
         <field name="name">Products</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
@@ -79,7 +70,7 @@
 
     <record model="document.directory" id="dir_sale_order">
         <field name="name">Sales Order</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
@@ -87,7 +78,7 @@
 
     <record model="document.directory" id="dir_sale_order_all">
         <field name="name">All Sales Order</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_sale_order"/>
         <field name="ressource_id">0</field>
 
@@ -95,7 +86,7 @@
 
     <record model="document.directory" id="dir_sale_order_quote">
         <field name="name">Quotations</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_sale_order"/>
         <field name="ressource_id">0</field>
 
@@ -103,7 +94,7 @@
 
     <record model="document.directory" id="dir_project">
         <field name="name">Projects</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>