diff options
| author | ron@tinyerp.com <> | 2010-12-31 16:28:16 +0530 |
|---|---|---|
| committer | ron@tinyerp.com <> | 2010-12-31 16:28:16 +0530 |
| commit | 6be4a3d45e0e641cdd2d7b4b3c612304884bbcc3 (patch) | |
| tree | 4b2ef16d524cf27fbffb2e3f850ae7a17b5e2e95 /addons/document/document_data.xml | |
| parent | 8198dc0d099dacfa3eafe244c76acc6bc09bf99a (diff) | |
| parent | 3583858ee66a8222398bf6fcf8d24eb1690d8f46 (diff) | |
[MERGE]with trunk-dev-addons2
bzr revid: ron@tinyerp.com-20101231105816-urbtb57pyqbdtgr1
Diffstat (limited to 'addons/document/document_data.xml')
| -rw-r--r-- | addons/document/document_data.xml | 16 |
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> |