summaryrefslogtreecommitdiff
path: root/addons/document/document_data.xml
diff options
context:
space:
mode:
authorSbh (OpenERP) <sbh@tinyerp.com>2010-12-31 10:29:26 +0530
committerSbh (OpenERP) <sbh@tinyerp.com>2010-12-31 10:29:26 +0530
commita329a57bdde3ca4006a1fea853c2cde49b90aa40 (patch)
tree7ca3a5b3ff097185d5e275a195012c2df1141941 /addons/document/document_data.xml
parentacf9c6417981c09f7a7f12fe5423705c542e623f (diff)
parentf8c4b4e72ffea7448648cb1b5e4e5576c9cfa970 (diff)
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101230131110-8l42t3b4hituf7aj bzr revid: sbh@tinyerp.com-20101231045926-gqkspd1jgoglv2qj
Diffstat (limited to 'addons/document/document_data.xml')
-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
--- 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>