diff --git a/models/res_partner.py b/models/res_partner.py
index d5b4d31631515ef85f205b22052bfd4f27e2d21e..c5b18bd4559b940131847ec55f97d8b8c0e30883 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -192,10 +192,6 @@ class ScopPartner(models.Model):
         domain=[('active', '=', True), ('is_company', '=', True),
                 ('organization_subtype_id.name', '=', 'Incubateur')],
         on_delete='restrict')
-    is_accountant = fields.Boolean(
-        "Est un Expert-comptable")
-    is_auditor = fields.Boolean(
-        "Est un Commissaire au compte")
 
     # Contacts
     director_ids = fields.One2many(
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 45f19222e006777b1923687813edffd2ae6fe647..2aa19815473d9484335ba437a3a572d60e0677f7 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -98,6 +98,9 @@
                     <attribute name="class"></attribute>
                 </field>
                 <field name="title" position="replace"/>
+                <xpath expr="//field[@name='type']" position="attributes">
+                    <attribute name="groups">base.group_no_one, cgscop_partner.group_cg_administrator</attribute>
+                </xpath>
                 <field name="street" position="attributes">
                     <attribute name="placeholder">Rue</attribute>
                 </field>
@@ -121,7 +124,7 @@
                     <attribute name="invisible">1</attribute>
                 </field>
                 <xpath expr='//form/sheet/group/group[2]' position="replace">
-                    <group name="Infos activités" attrs="{'invisible': [('is_company','=', False)]}">
+                    <group name="contact_segment_info" attrs="{'invisible': ['|', ('is_company','=', False), ('type','!=', 'contact')]}">
                         <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)]"/>
@@ -130,7 +133,7 @@
                         <field name="organization_subtype_id" attrs="{'invisible': [('is_company','=', False)]}" domain="[('child_ids', '=', False)]" options="{'no_create': True}"/>
                         <field name="organization_type_id" readonly="1" attrs="{'invisible': [('is_company','=', False)]}" options="{'no_create': True}"/>
                     </group>
-                    <group attrs="{'invisible': [('is_company','=', True)]}">
+                    <group name="partner_segment_info" attrs="{'invisible': ['|', ('is_company','=', True), ('type','!=', 'contact')]}">
                         <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"/>
@@ -243,7 +246,7 @@
 
                 <!-- Affiche les champs des organismes -->
                 <xpath expr='//form/sheet' position="inside">
-                    <div name="contact" attrs="{'invisible': [('is_cooperative', '=', False)]}">
+                    <div name="cooperative" attrs="{'invisible': [('is_cooperative', '=', False)]}">
                         <div class="oe_button_box" name="button_box">
                             <h3>
                                 <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Décédée le</span>
@@ -360,7 +363,7 @@
                                 <field name="creation_suborigin_id" domain="[('parent_id', '=', creation_origin_id), ('child_ids', '=', False)]" options="{'no_open': True, 'no_create': True}"/>
                                 <field name="date_1st_sign" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
                                 <field name="registration_date" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
-                                <field name="social_object" attrs="{'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '5_cg', '6_suivi'))]}"/>
+                                <field name="social_object" attrs="{'required': [('is_cooperative', '=', True), ('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '5_cg', '6_suivi'))]}"/>
                                 <field name="naf_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg'), '&amp;', ('write_date', '=', False), ('project_status', '=', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}" options="{'no_open': True, 'no_create': True}"/>
                                 <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
                                 <label for='siret' string="SIRET" class="oe_edit_only" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
@@ -373,7 +376,7 @@
                                 </div>
                                 <field name="siren" readonly="1" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
                                 <field name="capital" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}" widget="monetary"/>
-                                <field name="first_closeout" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
+                                <field name="first_closeout" attrs="{'required':[('is_cooperative', '!=', False), ('project_status', 'in', ('4_adhesion', '5_cg', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
                                 <field name="closeout_month" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
                                 <field name="is_seed_scop" attrs="{'invisible': [('project_status', '=', '1_information')]}"/>
                                 <field name="seed_end" attrs="{'invisible': [('is_seed_scop', '!=', True)], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi')),('is_seed_scop', '=', True)]}"/>
@@ -384,10 +387,10 @@
                             </group>
                         </group>
                         <notebook colspan="4">
-                            <page name="contacts" string="Contacts &amp; Addresses">
+                            <page name="scop_contacts" string="Contacts &amp; Addresses">
                                 <label for="director_ids" string="Dirigeants"/>
-                                <field name="director_ids" mode="kanban"
-                                    context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_city_id': city_id, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_ur_id': ur_id, 'default_type': 'contact'}">
+                                <field name="director_ids"
+                                    context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_city_id': city_id, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_ur_id': ur_id, 'default_type': 'contact', }">
                                     <kanban>
                                         <field name="id"/>
                                         <field name="color"/>
@@ -697,7 +700,7 @@
                                     </tree>
                                 </field>
                             </page>
-                            <page name='internal_notes' string="Commentaires">
+                            <page name='scop_internal_notes' string="Commentaires">
                                 <field name="comment" placeholder="Commentaires..."/>
                             </page>
                             <page name='scop_membership' string="Périodes d'adhésion" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
@@ -890,7 +893,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_res_partner_filter_partners"/>
-            <field name="domain" eval="[('is_company', '=', True), ('is_cooperative', '=', False)]"/>
+            <field name="domain" eval="[('is_company', '=', True), ('is_cooperative', '=', False), ('type', '=', 'contact')]"/>
             <field name="context">{'search_default_my_ur': 1, 'default_is_company': True, 'default_company_type': 'company'}</field>
             <field name="view_ids" eval="[(5, 0, 0),
                 (0, 0, {'view_mode': 'tree', 'view_id': ref('scop_partner_tree_view')}),