Merge with trunk-dev-addons2.

bzr revid: ysa@tinyerp.com-20110106112001-wh6d4y46mpm0bf5h

1 files changed, 21 insertions, 19 deletions

diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index f13213034e8..d32256f63a9 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,33 +1,35 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="0">
-
-    <record model="document.directory.content.type" id="pdf">
-        <field name="code">.pdf</field>
-        <field name="name">PDF Report</field>
-        <field name="mimetype">application/pdf</field>
-    </record>
+<data noupdate="1">
     
     <record model="document.storage" id="storage_default">
         <field name="name">Database storage</field>
         <field name="type">db</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <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="user_id" eval="False"/>
         <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="name">Admin Folder</field>
         <field name="parent_id" ref="dir_root"/>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" ref="base.user_root"/>
         <field name="ressource_id">0</field>
  
     </record>
+</data>
+
+<data noupdate="0">
+    <record model="document.directory.content.type" id="pdf">
+        <field name="code">.pdf</field>
+        <field name="name">PDF Report</field>
+        <field name="mimetype">application/pdf</field>
+    </record>
 
     <record model="document.directory" id="dir_partner_category">
         <field name="name">Partners by Category</field>
@@ -37,7 +39,7 @@
         <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" eval="False"/>
     </record>
 
     <record model="document.directory" id="dir_partner">
@@ -46,7 +48,7 @@
         <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" eval="False"/>
         <field name="ressource_id">0</field>
 
     </record>
@@ -55,14 +57,14 @@
         <field name="name">Personal Folders</field>
         <field name="parent_id" ref="dir_root"/>
         <field name="type">ressource</field>
+        <field name="user_id" eval="False"/>
         <field name="ressource_type_id" ref="base.model_res_users" />
         <field name="ressource_id">0</field>
-
     </record>
 
     <record model="document.directory" id="dir_product">
         <field name="name">Products</field>
-        <field name="user_id" ref="base.user_admin"/>
+        <field name="user_id" eval="False"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
@@ -70,7 +72,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" eval="False"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
 
@@ -78,7 +80,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" eval="False"/>
         <field name="parent_id" ref="dir_sale_order"/>
         <field name="ressource_id">0</field>
 
@@ -86,7 +88,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" eval="False"/>
         <field name="parent_id" ref="dir_sale_order"/>
         <field name="ressource_id">0</field>
 
@@ -94,7 +96,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" eval="False"/>
         <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>