[Merge]Merge lp:openobject-addons

bzr revid: vja@tinyerp.com-20130128115031-dy2ib57ox6rl7c4r

1 files changed, 1 insertions, 27 deletions

diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index a7bc98de6f3..bd73b11359b 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,17 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <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_root"/>
-    </record>
-
     <record model="document.directory" id="dir_root">
         <field name="name">Documents</field>
         <field name="user_id" eval="False"/>
-        <field name="storage_id" ref="storage_default"/>
         <field name="ressource_id">0</field>
     </record>
 
@@ -20,7 +12,6 @@
         <field name="parent_id" ref="dir_root"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="ressource_id">0</field>
- 
     </record>
 </data>
 
@@ -31,26 +22,13 @@
         <field name="mimetype">application/pdf</field>
     </record>
 
-    <record model="document.directory" id="dir_partner_category">
-        <field name="name">Partners by Category</field>
-        <field name="parent_id" ref="dir_root"/>
-        <field name="type">ressource</field>
-        <field name="ressource_tree">1</field>
-        <field name="ressource_id">0</field>
-
-        <field name="ressource_type_id" search="[('model','=','res.partner.category')]" />
-        <field name="user_id" eval="False"/>
-    </record>
-
     <record model="document.directory" id="dir_partner">
         <field name="name">Partners</field>
         <field name="type">ressource</field>
-        <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" eval="False"/>
+        <field name="parent_id" ref="dir_root"/>
         <field name="ressource_id">0</field>
-
     </record>
 
     <record model="document.directory" id="dir_personnal_folder">
@@ -61,7 +39,6 @@
         <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" eval="False"/>
@@ -101,8 +78,5 @@
         <field name="ressource_id">0</field>
     </record>
 
-    <!-- After we have setup the root directory, migrate the attachments
-        to point to that. -->
-    <function model="ir.attachment" name="_attach_parent_id"/>
 </data>
 </openerp>