merge lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam-base-tch

bzr revid: jam@tinyerp.com-20120806111908-fep93k1960300925
This commit is contained in:
Jigar Amin - OpenERP
2012-08-06 16:49:08 +05:30
+2 -3
View File
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="res_config_view_base" model="ir.ui.view">
<field name="name">res.config.view.base</field>
<field name="model">res.config</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<form string="Configuration" version="7.0">
<group string="res_config_contents"/>
<footer>
<button name="action_next" type="object" string="Apply" class="oe_highlight"/>
@@ -41,7 +40,7 @@
<field name="model">res.config.installer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
<form string="Configuration Installer" version="7.0">
<separator string="title" colspan="4"/>
<footer>
<button name="action_next" type="object" string="Install Modules" class="oe_highlight"/>