diff options
| author | qdp-launchpad@tinyerp.com <> | 2010-12-30 12:53:09 +0100 |
|---|---|---|
| committer | qdp-launchpad@tinyerp.com <> | 2010-12-30 12:53:09 +0100 |
| commit | 32589e25b4893fca654c1dc0ae6a44621756de3d (patch) | |
| tree | cb31f0cc818ec7938c35f654ad5d7ddfd159cd26 /addons/document/document_data.xml | |
| parent | e037fbcc31edafb815b198964b9b6d32b9814231 (diff) | |
| parent | aedda16fb934091e979f6d30d4e78625fbceeef6 (diff) | |
[MERGE] merged the xrg branch containing several bugfixes
bzr revid: qdp-launchpad@tinyerp.com-20101230115309-drnbznu04hx52cbj
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> |