diff options
| author | ARA (OpenERP) <ara@tinyerp.com> | 2011-01-03 15:06:18 +0530 |
|---|---|---|
| committer | ARA (OpenERP) <ara@tinyerp.com> | 2011-01-03 15:06:18 +0530 |
| commit | f97bd923d0833b2d4449de5a0cdf288e7b2e6c48 (patch) | |
| tree | a849a4b39f5b593c8b2317708d73c60ffa09513c /addons/document/document_data.xml | |
| parent | af5e218daf11b2f8ace2188b0d4a2fe8b9cfddf5 (diff) | |
| parent | 3bdca04e288bae689b5fd6d92a4c37ff88d665a2 (diff) | |
[MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110103093618-byyb6byysarfykrf
Diffstat (limited to 'addons/document/document_data.xml')
| -rwxr-xr-x | 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 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> |