diff options
| author | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
|---|---|---|
| committer | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
| commit | be2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch) | |
| tree | abcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/base_setup/res_config_view.xml | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/base_setup/res_config_view.xml')
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 65 |
1 files changed, 54 insertions, 11 deletions
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 0b85e13a08f..85a20bddf52 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -8,24 +8,33 @@ <field name="arch" type="xml"> <form string="General Settings" version="7.0"> <header> - <button string="Apply" type="object" name="execute"/> - <button string="Cancel" special="cancel"/> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <group> + <sheet> <group string="Company Settings"> - <field name="module_multi_company"/> - </group> - - <group string="Others"> - <label string="Outgoing Mail Servers"/> - <button type="action" name="%(base.action_ir_mail_server_list)d" - string="Configure" icon="gtk-execute"/> + <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> <group string="External Accesses"> <field name="module_share"/> <field name="module_portal"/> </group> - </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> </form> </field> </record> @@ -39,5 +48,39 @@ <menuitem id="menu_general_configuration" parent="base.menu_config" sequence="100" action="action_general_configuration"/> + <!-- Sale config wizard --> + <record id="view_sale_config_settings" model="ir.ui.view"> + <field name="name">sale settings</field> + <field name="model">sale.config.settings</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Configure Sales" version="7.0"> + <header> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + 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> + </form> + </field> + </record> + + <record id="action_sale_config" model="ir.actions.act_window"> + <field name="name">Configure Sales</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">sale.config.settings</field> + <field name="view_id" ref="view_sale_config_settings"/> + <field name="view_mode">form</field> + <field name="target">inline</field> + </record> + </data> </openerp> |