diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-06 17:17:05 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2011-01-06 17:17:05 +0530 |
| commit | dec836ec284ea874822e29b183d62502266c3c56 (patch) | |
| tree | c09567d903a1ec5bce7adce07043c0281ef60fcb /addons/document/document_data.xml | |
| parent | 61b21841b1751b63336cb8dcacab57c76ff6b0a1 (diff) | |
| parent | c738ec75ca0048c13b7854a0665ae87f048e3acf (diff) | |
[MERGE] Merge with team1 branch
bzr revid: sbh@tinyerp.com-20110106114705-9jbx7e33a2sl101c
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> |