diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-06-11 18:17:02 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-06-11 18:17:02 +0530 |
| commit | 3daedd56c24e9a86d74dedb2b3b04f4d09e3bd32 (patch) | |
| tree | 88c4f24b3a32cb9afed3c25c32c43fb290e64ba8 /addons/base_setup/base_setup_views.xml | |
| parent | 45af06ba68f6329281a5dadb4ed245d0157d8e52 (diff) | |
| parent | b2f173d4b2d3cb804111b801868d494eec19756c (diff) | |
[MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120611124702-f45l1i7kqzjs7sua
Diffstat (limited to 'addons/base_setup/base_setup_views.xml')
| -rw-r--r-- | addons/base_setup/base_setup_views.xml | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 0692b4f651c..5046b122bf5 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -9,20 +9,12 @@ <field name="inherit_id" ref="base.res_config_view_base"/> <field name="arch" type="xml"> <data> - <form position="attributes"> + <form position="attributes" version="7.0"> <attribute name="string">Specify Your Terminology</attribute> </form> - <xpath expr="//separator[@string="title"]" position="attributes"> - <attribute name="string">Specify Your Terminology</attribute> - </xpath> - <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">You can use this wizard to change the terminologies for customers in the whole application.</attribute> - </xpath> - <xpath expr="//separator[@string="vsep"]" position="attributes"> - <attribute name="string"/> - <attribute name="rowspan">12</attribute> - </xpath> <group string="res_config_contents" position="replace"> + <label string="You can use this wizard to change the terminologies for customers in the whole application."/> + <separator string="Specify Your Terminology"/> <group colspan="4"> <field colspan="4" name="partner"/> </group> @@ -45,25 +37,25 @@ <field name="model">sale.config.settings</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Configure Sales" layout="manual"> + <form string="Configure Sales" version="7.0"> <header> <button string="Apply" type="object" name="execute"/> <button string="Cancel" special="cancel"/> </header> - <sheet layout="auto"> + <sheet> <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)]}"> + <group name="config_fetchmail" colspan="2" 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"/> + <group name="config_crm" colspan="2"/> </group> </sheet> </form> |