summaryrefslogtreecommitdiff
path: root/addons/document/document_data.xml
diff options
context:
space:
mode:
authorpsi (Open ERP) <psi@tinyerp.co.in>2011-01-03 16:29:59 +0530
committerpsi (Open ERP) <psi@tinyerp.co.in>2011-01-03 16:29:59 +0530
commit8769150fa107e61d13208d4d905164f1da7a460c (patch)
treea849a4b39f5b593c8b2317708d73c60ffa09513c /addons/document/document_data.xml
parente6cd3e3f7edbb52bc90d1505f7b58336d494df6d (diff)
parent3bdca04e288bae689b5fd6d92a4c37ff88d665a2 (diff)
[MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110103105959-3udx19z8uowo8n17
Diffstat (limited to 'addons/document/document_data.xml')
-rwxr-xr-x[-rw-r--r--]addons/document/document_data.xml16
1 files changed, 9 insertions, 7 deletions
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index a4f546cbf83..d32256f63a9 100644..100755
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,12 +1,6 @@
<?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>
@@ -28,6 +22,14 @@
<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>