[MERGE] Merge with main addons

[odoo/odoo.git] / addons / users_ldap / users_ldap_view.xml

diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 40d01f4..b87800a 100644 (file)
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,30 +7,32 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Configuration']" position="inside">
-                    <field name="ldaps" nolabel="1" colspan="4">
-                        <form string="LDAP Configuration" version="7.0">
-                            <group col="4">
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group string="LDAP Parameters">
+                        <field name="ldaps" nolabel="1" colspan="4">
+                            <form string="LDAP Configuration" version="7.0">
+                                <group col="4">
+                                    <field name="ldap_server"/>
+                                    <field name="ldap_server_port"/>
+                                    <field name="ldap_binddn"/>
+                                    <field name="ldap_password"/>
+                                    <field name="ldap_base"/>
+                                    <field name="ldap_filter"/>
+                                    <field name="create_user"/>
+                                    <field name="user"/>
+                                    <newline/>
+                                    <field name="sequence"/>
+                                    <field name="ldap_tls"/>
+                                </group>
+                            </form>
+                            <tree string="LDAP Configuration">
+                                <field name="sequence"/>
                                 <field name="ldap_server"/>
                                 <field name="ldap_server_port"/>
-                                <field name="ldap_binddn"/>
-                                <field name="ldap_password"/>
                                 <field name="ldap_base"/>
-                                <field name="ldap_filter"/>
-                                <field name="create_user"/>
-                                <field name="user"/>
-                                <newline/>
-                                <field name="sequence"/>
-                                <field name="ldap_tls"/>
-                            </group>
-                        </form>
-                        <tree string="LDAP Configuration">
-                            <field name="sequence"/>
-                            <field name="ldap_server"/>
-                            <field name="ldap_server_port"/>
-                            <field name="ldap_base"/>
-                        </tree>
-                    </field>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
             </field>
         </record>