diff --git a/views/res_partner.xml b/views/res_partner.xml
index 8340b9c2abdfcce801a56106547bda5c4f66153b..5db9ec9c2623efefc607542eb8d9a3da3357a676 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -126,7 +126,7 @@
<attribute name="invisible">1</attribute>
</field>
<xpath expr='//form/sheet/group/group[2]' position="replace">
- <group name="partner_segment_info" attrs="{'invisible': ['|', ('is_company','=', False), ('type','!=', 'contact')]}">
+ <group name="partner_segment_info" attrs="{'invisible': [ ('is_company','=', False)]}">
<field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" attrs="{'invisible': [('is_company','=', False)]}"/>
<field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
<field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
@@ -135,21 +135,15 @@
<field name="organization_subtype_id" attrs="{'invisible': [('is_company','=', False)]}" domain="[('child_ids', '=', False)]" options="{'no_create': True, 'no_open': True}"/>
<field name="organization_type_id" readonly="1" attrs="{'invisible': [('is_company','=', False)]}" options="{'no_create': True, 'no_open': True}"/>
</group>
- <group name="contact_segment_info" attrs="{'invisible': ['|', ('is_company','=', True), ('type','!=', 'contact')]}">
+ <group name="contact_segment_info" attrs="{'invisible': [ ('is_company','=', True)]}">
<field name="title" options='{"no_create": True, "no_open": True}' attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="mandate_id" options='{"no_create": True, "no_open": True}' attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="function"/>
- <field name="employee" widget="boolean_toggle" attrs="{'invisible': [('is_company','=', True)]}"/>
+ <field name="employee" attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="associate" attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="birthyear" attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="contact_origin_id" attrs="{'invisible': [('is_company','=', True)]}" options="{'no_create': True, 'no_open': True}"/>
<field name="contact_legality" readonly="True" attrs="{'invisible': [('is_company','=', True)]}"/>
- <!--
- <field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- -->
</group>
</xpath>
<xpath expr='//form/sheet/group' position="after">
@@ -170,12 +164,9 @@
<xpath expr="//field[@name='child_ids']//kanban//div[hasclass('oe_kanban_details')]//field[@name='name']" position="after">
<div t-if="record.mandate_id.raw_value"><field name="mandate_id"/></div>
</xpath>
- <xpath expr="//field[@name='child_ids']//form//field[@name='function']" position="before">
+ <xpath expr="//field[@name='child_ids']//form//field[@name='function']" position="replace">
<field name="ur_id" invisible="1" options='{"no_open": True, "no_create": True}'/>
</xpath>
- <xpath expr="//field[@name='child_ids']//form//field[@name='function']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
<xpath expr="//field[@name='child_ids']//form//field[@name='street']" position="attributes">
<attribute name="placeholder">Rue</attribute>
</xpath>
@@ -207,19 +198,13 @@
</xpath>
<xpath expr="//field[@name='child_ids']/form//group/group[2]" position="after">
<group attrs="{'invisible': [('type', '!=', 'contact')]}">
- <field name="mandate_id" options='{"no_open": True, "no_create": True}' attrs="{'invisible': [('type','!=', 'contact')]}"/>
+ <field name="mandate_id" options='{"no_open": True, "no_create": True}' />
<field name="function"/>
- <field name="employee" widget="boolean_toggle" />
+ <field name="employee" />
<field name="associate" />
<field name="birthyear"/>
<field name="contact_origin_id" options="{'no_open': True, 'no_create': True}"/>
<field name="contact_legality" readonly="1"/>
- <!--
- <field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- -->
</group>
</xpath>
<xpath expr="//field[@name='child_ids']/form//group" position="after">
@@ -497,17 +482,11 @@
<group>
<field name="mandate_id" options="{'no_open': True, 'no_create': True}" required="1"/>
<field name="function" />
- <field name="employee" widget="boolean_toggle" />
+ <field name="employee" />
<field name="associate" />
<field name="birthyear"/>
<field name="contact_origin_id" options="{'no_open': True, 'no_create': True}"/>
<field name="contact_legality" readonly="1"/>
- <!--
- <field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- -->
</group>
</group>
<field name="subscription_ids">
@@ -641,20 +620,14 @@
<field name="comment" placeholder="internal note..."/>
</group>
<group attrs="{'invisible': [('type', '!=', 'contact')]}">
- <field name="mandate_id" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}"/>
+ <field name="mandate_id" options="{'no_open': True, 'no_create': True}" />
<field name="function"
- attrs="{'invisible': [('type','!=', 'contact')]}"/>
- <field name="employee" widget="boolean_toggle" />
+ />
+ <field name="employee" />
<field name="associate" />
<field name="birthyear"/>
<field name="contact_origin_id" options="{'no_open': True, 'no_create': True}"/>
<field name="contact_legality" readonly="1"/>
- <!--
- <field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- -->
</group>
</group>
<field name="subscription_ids" attrs="{'invisible': [('type', '!=', 'contact')]}">