diff --git a/models/res_partner.py b/models/res_partner.py
index 215be924ccc5826dd4283b2b3a0e30eab51f71a8..0d11c3cd4114eb7defd16d5f235ece444dee4b32 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -71,7 +71,6 @@ class ScopPartner(models.Model):
     country_id = fields.Many2one('res.country', string='Country',
                                  ondelete='restrict',
                                  default=_default_country)
-    admin_email = fields.Char('E-mail administratif')
     facebook = fields.Char("Facebook")
     linkedin = fields.Char("LinkedIn")
     twitter = fields.Char("Twitter")
diff --git a/security/security_rules.xml b/security/security_rules.xml
index 162d4b664db12ebced4e36e7bf659ed74b6f21e3..96cb3e0b5b501256e3dbf3eb6da252298ba5e607 100644
--- a/security/security_rules.xml
+++ b/security/security_rules.xml
@@ -5,15 +5,13 @@
 <odoo>
 
     <data noupdate="1">
-
-        <record id="base.res_company_rule_employee" model="ir.rule">
-            <field name="name">company rule employee</field>
-            <field name="model_id" ref="base.model_res_company"/>
-            <field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>
-            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
+        <record id="res_partner_rule_ur" model="ir.rule">
+            <field name="name">partner rule per ur</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="domain_force">['|',('ur_id','=',False),('ur_id','=',user.company_id.ur_id.id)]</field>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="False"/>
         </record>
     </data>
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 6a013eca33513cc9c24c7934092fed9e0567f1f9..0dbe2cfb79828f9e615765d2b2048aeb3fe1d7fa 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -66,15 +66,17 @@
             </field>
         </record>
 
-         <record id="scop_contact_view_form" model="ir.ui.view">
+        <record id="scop_contact_view_form" model="ir.ui.view">
             <field name="name">add scop fields in form view</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="priority" eval="120"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('oe_title')]" position="attributes">
                     <attribute name="class">oe_title oe_title_cgscop</attribute>
                 </xpath>
+                <field name="company_type" position="attributes">
+                    <attribute name="invisible">True</attribute>
+                </field>
                 <field name="title" position="replace"/>
                 <field name="zip" position="replace"/>
                 <field name="city" position="before">
@@ -112,6 +114,12 @@
                         </tree>
                     </field>
                 </xpath>
+                <xpath expr="//field[@name='child_ids']//kanban//field[@name='function']" position="before">
+                    <field name="mandate_id"/>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//form//field[@name='function']" position="before">
+                    <field name="mandate_id" options="{'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}"/>
+                </xpath>
                 <field name="vat" position="replace">
                     <field name="phone" widget="phone"/>
                     <field name="mobile" widget="phone" attrs="{'invisible': [('is_company','=', True)]}"/>
@@ -130,7 +138,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_res_partner_filter_persons"/>
-            <field name="domain" eval="[('is_company', '=', False)]"/>
+            <field name="domain" eval="[('is_company', '=', False), ('type', '=', 'contact')]"/>
             <field name="context">{'search_default_my_ur': 1, 'default_is_company': False, 'default_company_type': 'person'}</field>
             <field name="view_ids" eval="[(5, 0, 0),
                 (0, 0, {'view_mode': 'tree', 'view_id': ref('base.view_partner_tree')}),
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index 9bc9574da332f47afb13876153eae39652310c1b..7100f3cfe2e611f15bf48db8d384508f47947fb2 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -75,7 +75,7 @@
                 <form string="Cooperatives" attrs="{'readonly': [('project_status', '=', '5_cg')]}">
                     <header>
                         <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"/>
-                        <button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"/>
+                        <button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"/>
                         <button string="Envoyer Dossier CG" type="object" name="scop_send_to_cg" class="btn-primary" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_adhesion')]}"/>
                         <button string="Dossier créé CG (temp)" type="object" name="scop_valid_cg" class="btn-primary" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '5_cg')]}"/>
                         <button string="Prospect Abandonne" type="object" name="scop_abandonne" attrs="{'invisible':[('project_status','in',('5_cg', '6_suivi', '7_abandonne'))]}"/>
@@ -164,8 +164,7 @@
                                 </div>
                                 <field name="phone" widget="phone" string="Téléphone 1"/>
                                 <field name="mobile" widget="phone" string="Téléphone 2"/>
-                                <field name="admin_email" widget="email" string="E-mail administratif"/>
-                                <field name="email" widget="email" string="E-mail commercial"/>
+                                <field name="email" widget="email" string="E-mail"/>
                                 <field name="website" widget="url"/>
                                 <label for='facebook' class="oe_read_only" string="Réseaux sociaux" attrs="{'invisible':[('facebook','=',False),('linkedin','=',False),('twitter','=',False)]}"/>
                                 <div >
@@ -203,6 +202,7 @@
                                 <field name="naf_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}" context="{'partner_category_display': 'short'}" options="{'no_create': True}"/>
                                 <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
                                 <field name="siret" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}"/>
+                                <field name="siren" readonly="1"/>
                                 <field name="capital" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}" widget="monetary"/>
                                 <field name="first_closeout" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}"/>
                                 <field name="closeout_month" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}"/>
@@ -217,7 +217,7 @@
                             <page name="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_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact'}">
+                                    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_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact', 'default_ur_id': ur_id}">
                                     <kanban>
                                         <field name="id"/>
                                         <field name="name"/>
@@ -245,6 +245,7 @@
                                         <field name="customer"/>
                                         <field name="display_name"/>
                                         <field name="supplier"/>
+                                        <field name="ur_id"/>
                                         <templates>
                                             <t t-name="kanban-box">
                                                 <div t-att-class="oe_kanban_global_click">
@@ -295,12 +296,13 @@
                                             <field name="lang" invisible="True"/>
                                             <field name="image" invisible="True"/>
                                             <field name="user_id" invisible="True"/>
+                                            <field name="ur_id" invisible="True"/>
                                         </sheet>
                                     </form>
                                 </field>
                                 <label for="child_ids" string="Autres Contacts"/>
                                 <field name="child_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_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id}">
+                                    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_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_ur_id': ur_id}">
                                     <kanban>
                                         <field name="id"/>
                                         <field name="name"/>
@@ -309,6 +311,7 @@
                                         <field name="email"/>
                                         <field name="parent_id"/>
                                         <field name="is_company"/>
+                                        <field name="mandate_id"/>
                                         <field name="function"/>
                                         <field name="phone"/>
                                         <field name="street"/>
@@ -326,6 +329,7 @@
                                         <field name="customer"/>
                                         <field name="display_name"/>
                                         <field name="supplier"/>
+                                        <field name="ur_id"/>
                                         <templates>
                                             <t t-name="kanban-box">
                                                 <div t-att-class="oe_kanban_global_click">
@@ -367,7 +371,7 @@
                                                             <field name="street3" placeholder="Rue 3..." class="o_address_street"/>
                                                             <field name="zip_id"
                                                                    options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
-                                                                   placeholder="City completion"
+                                                                   placeholder="CP/Ville autocomplétion"
                                                                    class="oe_edit_only"/>
                                                             <field name="zip" placeholder="ZIP" class="o_address_city"/>
                                                             <field name="city" placeholder="Ville" class="o_address_city"
@@ -382,10 +386,11 @@
                                                     </div>
                                                 </group>
                                                 <group>
-                                                    <field name="lastname" string="Contact Name" attrs="{'required' : [('type', '=', 'contact')]}"/>
-                                                    <field name="firstname" string="Contact Name" attrs="{'required' : [('type', '=', 'contact')]}"/>
-                                                    <field name="title" placeholder="e.g. Mr."
+                                                    <field name="lastname" string="Nom de famille" attrs="{'required' : [('type', '=', 'contact')]}"/>
+                                                    <field name="firstname" string="Prénom" attrs="{'required' : [('type', '=', 'contact')]}"/>
+                                                    <field name="title" placeholder="e.g. Madame"
                                                         attrs="{'invisible': [('type','!=', 'contact')]}"/>
+                                                    <field name="mandate_id" options="{'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}" required="1"/>
                                                     <field name="function" placeholder="e.g. Directeur des Ventes"
                                                         attrs="{'invisible': [('type','!=', 'contact')]}"/>
                                                     <field name="email"/>
@@ -399,6 +404,7 @@
                                             <field name="lang" invisible="True"/>
                                             <field name="image" invisible="True"/>
                                             <field name="user_id" invisible="True"/>
+                                            <field name="ur_id" invisible="True"/>
                                         </sheet>
                                     </form>
                                 </field>