diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-04-25 12:30:42 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-04-25 12:30:42 +0200 |
| commit | fca52c458aeb29eb0ef2b18df69d3f52ca90fe21 (patch) | |
| tree | 31faf555383d7a2267d67ea6ea39f1cdb2fe5e59 /addons/base_setup/base_setup_views.xml | |
| parent | 74b003f101ee9c36e02fd905fd4e1d9e4803888a (diff) | |
| parent | e9f015e217f1ff48d95e9b55a9515b7276240c48 (diff) | |
[MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20120425103042-sih66nc0vd1s0ftd
Diffstat (limited to 'addons/base_setup/base_setup_views.xml')
| -rw-r--r-- | addons/base_setup/base_setup_views.xml | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 453d4b167c0..40e88c604ef 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -132,28 +132,31 @@ <field name="model">sale.config.settings</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Configure Sales"> - <group name="config_sale" colspan="4"/> + <form string="Configure Sales" layout="manual"> + <div class="oe_form_topbar"> + <button string="Apply" type="object" name="execute"/> + <button string="Cancel" special="cancel"/> + </div> + <sheet layout="auto"> + <group> + <group name="config_sale" colspan="4"/> - <!-- this part is necessary to allow the plugins to extend the view --> - <field name="module_crm" invisible="1"/> - <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}"> - <separator string="Emails"/> - </group> - <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/> - <newline/> - <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/> + <!-- this part is necessary to allow the plugins to extend the view --> + <field name="module_crm" invisible="1"/> + <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}"> + <separator string="Emails"/> + </group> + <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/> + <newline/> + <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/> - <group name="config_crm" colspan="4"/> - - <newline/> - <label colspan="2"/> - <button string="Cancel" icon="gtk-cancel" special="cancel"/> - <button string="Apply" icon="gtk-apply" type="object" name="execute"/> + <group name="config_crm" colspan="4"/> + </group> + </sheet> </form> </field> </record> - + <record id="base.action_sale_config" model="ir.actions.act_window"> <field name="name">Configure Sales</field> <field name="type">ir.actions.act_window</field> |