[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
This commit is contained in:
Mustufa Rangwala
2011-01-03 14:38:25 +05:30
431 changed files with 26163 additions and 4518 deletions
+9 -7
View File
@@ -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>