[MERGE] Upstream

bzr revid: stw@openerp.com-20110922131429-vlgqxnb37jsoaq5l
This commit is contained in:
Stephane Wirtel
2011-09-22 15:14:29 +02:00
70 changed files with 4452 additions and 1449 deletions
-2
View File
@@ -70,7 +70,6 @@
</record>
<record id="base_setup_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_installer"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="sequence">2</field>
</record>
@@ -222,7 +221,6 @@
</record>
<record id="base_setup_company_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_company"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="sequence">1</field>
</record>
<!-- register Upload Logo configuration wizard -->