diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-10 15:52:01 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-10 15:52:01 +0530 |
| commit | 6dbd4e000dcb22d2ffcfeb7a9080eeffcbbcc7f8 (patch) | |
| tree | 5d1c3d763d9282312b22ca9e226515f20ce37d47 /addons/base_setup | |
| parent | 4e08b80952c7f50357f8f97b69495562631e9d55 (diff) | |
| parent | f25ad676a34670f4ba1ac14bf2d6babd8ccc88b5 (diff) | |
[MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20120710102201-h5mjjkoyprp70lf0
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 85a20bddf52..8607e671085 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -12,29 +12,27 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Company Settings"> - <group> - <field name="module_multi_company"/> - </group> - <group> - <div> - You will also find several configuration options on your company data: - address for the header and footer, overdue payments texts, etc. - </div> - <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/> - </group> + <group string="Company Settings"> + <group> + <field name="module_multi_company"/> </group> - <group string="External Accesses"> - <field name="module_share"/> - <field name="module_portal"/> + <group> + <div> + You will also find several configuration options on your company data: + address for the header and footer, overdue payments texts, etc. + </div> + <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/> </group> - <group string="Others"> - <label for="id" string="Outgoing Mail Servers"/> - <button type="action" name="%(base.action_ir_mail_server_list)d" - string="Configure" icon="gtk-execute"/> - </group> - </sheet> + </group> + <group string="External Accesses"> + <field name="module_share"/> + <field name="module_portal"/> + </group> + <group string="Others"> + <label for="id" string="Outgoing Mail Servers"/> + <button type="action" name="%(base.action_ir_mail_server_list)d" + string="Configure" icon="gtk-execute"/> + </group> </form> </field> </record> @@ -60,15 +58,13 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <field name="module_crm" invisible="1"/> - <group name="config_sale"/> - <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}"> - <field name="module_plugin_thunderbird"/> - <field name="module_plugin_outlook"/> - </group> - <group name="config_crm"/> - </sheet> + <field name="module_crm" invisible="1"/> + <group name="config_sale"/> + <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}"> + <field name="module_plugin_thunderbird"/> + <field name="module_plugin_outlook"/> + </group> + <group name="config_crm"/> </form> </field> </record> |