[MERGE] Sync with trunk

bzr revid: rim@openerp.com-20140327073402-etdn15qip5oirm7y

1 files changed, 0 insertions, 93 deletions

diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
deleted file mode 100644
index dbf6bc8fbcc..00000000000
--- a/addons/document_webdav/webdav_setup.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<openerp>
-<data noupdate="1">
-<!--This file contains a typical setup of a WebDAV folders' structure, 
-    which conforms to the RFCs and extensions of the protocol.
-    In OpenERP, this is not enforced by any code inside the server, it
-    is rather a matter of setting these records in our document configuration.
--->
-
-        <!-- /principals tree -->
-        <record id="document_directory_principals0" model="document.directory">
-                <field name="domain">[]</field>
-                <field eval="1" name="resource_find_all"/>
-                <field eval="0" name="ressource_tree"/>
-                <field name="user_id" eval="False"/>
-                <field name="company_id" ref="base.main_company"/>
-                <field name="type">directory</field>
-                <field eval="[(6,0,[])]" name="group_ids"/>
-                <field name="name">principals</field>
-        </record>
-
-        <record id="document_directory_groups0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">groups</field>
-        </record>
-
-        <record id="document_directory_resources0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">resources</field>
-        </record>
-        <record id="document_directory_uids1" model="document.directory">
-            <field name="domain">[('id','=',uid)]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="resource_field" ref="base.field_res_users_login"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">ressource</field>
-            <field name="ressource_type_id" ref="base.model_res_users"/>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">__uids__</field>
-        </record>
-        <record id="document_directory_users1" model="document.directory">
-            <field name="domain">[('id','=',uid)]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="resource_field" ref="base.field_res_users_login"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">ressource</field>
-            <field name="ressource_type_id" ref="base.model_res_users"/>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">users</field>
-        </record>
-        <record id="document_directory_locations0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">locations</field>
-        </record>
-        <record id="document_webdav_dir_property_currentuserprincipal0" model="document.webdav.dir.property">
-            <field name="namespace">DAV:</field>
-            <field name="name">current-user-principal</field>
-            <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
-            <field eval="1" name="do_subst"/>
-        </record>
-        <record id="document_webdav_dir_property_principalurl0" model="document.webdav.dir.property">
-            <field name="namespace">DAV:</field>
-            <field name="name">principal-URL</field>
-            <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
-            <field eval="1" name="do_subst"/>
-        </record>
-
-</data>
-</openerp>
\ No newline at end of file