[update] refonte partner view

views/res_partner.xml

@@ -68,18 +68,12 @@
                 <xpath expr="//form/sheet/group" position="attributes">
                     <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute>
                 </xpath>
-                <xpath expr="//field[@name='image']" position="attributes">
-                    <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute>
-                </xpath>
                 <xpath expr="//div[hasclass('oe_title')]" position="attributes">
                     <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute>
                 </xpath>
                 <xpath expr="//form/sheet/group" position="attributes">
                     <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute>
                 </xpath>
-                <xpath expr="//notebook" position="attributes">
-                    <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute>
-                </xpath>
 
                 <!-- Affiche les champs de la vue partenaire -->
                 <field name="parent_id" position="before">
@@ -139,7 +133,7 @@
                         <field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible':[('segment_4_nb', '=', 0)]}"/>
                         <field name="organization_subtype_id" attrs="{'invisible': ['|', ('is_company','=', False), ('type', '!=', 'contact')]}" domain="[('child_ids', '=', False)]" options="{'no_create': True, 'no_open': True}"/>
                         <field name="organization_type_id" readonly="1" attrs="{'invisible': ['|', ('is_company', '=', False), ('type', '!=', 'contact')]}" options="{'no_create': True, 'no_open': True}"/>
-                        <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': ['|', ('is_company','=', False), ('type', '!=', 'contact')]}"/>
+                        <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': ['|', ('is_company','=', False), ('type', '!=', 'contact')]}"/>
                     </group>
                     <group name="contact_segment_info" attrs="{'invisible': ['|', ('is_company', '=', True), ('type', '!=', 'contact')]}">
                         <field name="title" options='{"no_create": True, "no_open": True}' attrs="{'invisible': [('is_company','=', True)]}"/>
@@ -151,7 +145,7 @@
                         <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="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]"/>
+                        <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]"/>
                     </group>
                 </xpath>
                 <xpath expr='//form/sheet/group' position="after">
@@ -196,11 +190,9 @@
                 <xpath expr="//field[@name='child_ids']//form//field[@name='state_id']" position="attributes">
                     <attribute name="placeholder">Région</attribute>
                 </xpath>
-
                 <xpath expr="//field[@name='child_ids']//form//field[@name='mobile']" position="after">
                     <field name="category_id" options='{"no_open": True, "no_create": True}' widget="many2many_tags" attrs="{'invisible': [('type', '!=', 'contact')]}"/>
                 </xpath>
-
                 <xpath expr="//field[@name='child_ids']//form//field[@name='title']" position="attributes">
                     <attribute name="options">{'no_open': True, 'no_create': True}</attribute>
                 </xpath>
@@ -239,8 +231,17 @@
                     <field name="category_id" options='{"no_open": True, "no_create": True}' widget="many2many_tags" attrs="{'invisible': ['|', ('is_company', '=', True), ('type', '!=', 'contact')]}"/>
                     <field name="lang" invisible="1"/>
                 </field>
+                <xpath expr="//notebook/page" position="attributes">
+                    <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute>
+                </xpath>
+                <xpath expr="//notebook/page[@name='internal_notes']" position="attributes">
+                    <attribute name="string">Commentaires</attribute>
+                </xpath>
+                <xpath expr="//field[@name='comment']" position="attributes">
+                    <attribute name="placeholder">Commentaires...</attribute>
+                </xpath>
                 <xpath expr="//notebook/page[@name='sales_purchases']" position="attributes">
-                    <attribute name="invisible">True</attribute>
+                    <attribute name="groups">cgscop_partner.group_cg_administrator</attribute>
                 </xpath>
 
                 <!--
@@ -263,15 +264,14 @@
                         <field name="project_status" widget="statusbar" clickable="True" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion" attrs="{'invisible':[('project_status','in',('6_suivi'))]}"/>
                     </header>
                 </xpath>
-
+                <!-- Masque le bouton Archiver -->
                 <xpath expr="//button[@name='toggle_active']" position="attributes">
                     <attribute name="attrs">{'invisible': ['&amp;', ('is_cooperative','=', True), ('project_status', '!=', '7_abandonne')]}</attribute>
                 </xpath>
 
-                <!-- Affiche les champs des organismes -->
-                <xpath expr='//form/sheet' position="inside">
-                    <div name="cooperative" attrs="{'invisible': [('is_cooperative', '=', False)]}">
-                        <div class="oe_button_box" name="button_box">
+                <!-- Titre, logo & status -->
+                <field name="image" position="before">
+                    <div class="oe_button_box" name="button_box" attrs="{'invisible': [('is_cooperative', '!=', True)]}">
                         <h3>
                             <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Décédée le</span>
                             <field name="dissolution_date" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/>
@@ -281,8 +281,9 @@
                             <field options="{'no_open': True}" name="dissolution_reason_id" readonly="1"  attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/>
                         </h3>
                     </div>
-                        <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
-                        <div class="oe_title oe_title_cgscop">
+                </field>
+                <field name="image" position="after">
+                    <div class="oe_title oe_title_cgscop" attrs="{'invisible': [('is_cooperative', '!=', True)]}">
                             <field name="is_cooperative" invisible="1"/>
                             <field name="write_date" invisible="1"/>
                             <h1>
@@ -316,7 +317,11 @@
                                 </div>
                             </div>
                         </div>
-                        <group col="3" string="Informations Générales">
+                </field>
+
+                <!-- Partie statique avant Notebook -->
+                <xpath expr="//form/sheet/group" position="after">
+                    <group col="3" string="Informations Générales" name="scop_general_infos" attrs="{'invisible': [('is_cooperative','=', False)]}">
                             <group string="Contact">
                                 <field name="sigle" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic'))]}"/>
                                 <label for='street' string="Adresse du siège social"/>
@@ -375,10 +380,10 @@
                             </group>
                             <group string="Suivi UR">
                                 <field name="ur_id" required="True" options="{'no_open': True, 'no_create': True}"/>
-                                <field name="creation_delegate_id" widget="res_partner_many2one"
+                                <field name="creation_delegate_id"
                                     attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '5_cg'))], 'invisible':[('project_status', 'in', '6_suivi')]}" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
-                                <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
-                                <field name="support_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" />
+                                <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/>
+                                <field name="support_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" />
                                 <field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible': ['|',('project_status', 'in', ('1_information')),('segment_1_nb', '=', 0)]}"/>
                                 <field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible': ['|',('project_status', 'in', ('1_information')),('segment_2_nb', '=', 0)]}"/>
                                 <field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible': ['|',('project_status', 'in', ('1_information')),('segment_3_nb', '=', 0)]}"/>
@@ -412,13 +417,16 @@
                                 <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)]}"/>
                                 <field name="is_incubated" attrs="{'invisible': [('project_status', '=', '1_information')]}"/>
-                                <field name="incubator_id" widget="res_partner_many2one" attrs="{'invisible': [('is_incubated', '!=', True)]}" options="{'no_create': True}"/>
+                                <field name="incubator_id" attrs="{'invisible': [('is_incubated', '!=', True)]}" options="{'no_create': True}"/>
                                 <field name="staff_last" attrs="{'invisible': [('project_status', 'not in', ('6_suivi'))]}"/>
                                 <field name="staff_last_date" attrs="{'invisible': [('project_status', 'not in', ('6_suivi'))]}"/>
                             </group>
                         </group>
-                        <notebook colspan="4">
-                            <page name="scop_contacts" string="Contacts &amp; Addresses">
+                </xpath>
+
+                <!-- Notebook organismes -->
+                <xpath expr="//notebook/page" position="after">
+                    <page name="scop_contacts" string="Contacts &amp; Addresses" attrs="{'invisible': [('is_cooperative', '!=', True)]}">
                             <!-- Directeurs et mandataires -->
                             <label for="director_ids" string="Dirigeants et mandataires"/>
                             <p>
@@ -559,14 +567,14 @@
                                 </kanban>
                             </field>
                         </page>
-                            <page name='scop_revision' string="Révisions" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
+                    <page name='scop_revision' string="Révisions" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}">
                         <group string="Informations de révision">
                             <group>
                                 <field name="revision_contract"/>
-                                        <field name="revision_company_id" widget="res_partner_many2one" options="{'no_create': True}"/>
-                                        <field name="revision_backup_company_id" widget="res_partner_many2one" options="{'no_create': True}"/>
-                                        <field name="revision_person_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}"/>
-                                        <field name="revision_certified_person_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}"/>
+                                <field name="revision_company_id" options="{'no_create': True}"/>
+                                <field name="revision_backup_company_id" options="{'no_create': True}"/>
+                                <field name="revision_person_id" options="{'no_open': True, 'no_create': True}"/>
+                                <field name="revision_certified_person_id" options="{'no_open': True, 'no_create': True}"/>
                                 <field name="revision_person_assign_date"/>
                             </group>
                             <group>
@@ -587,7 +595,7 @@
                             </tree>
                         </field>
                     </page>
-                            <page name="scop_periods" string="Historique" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
+                    <page name="scop_periods" string="Historique" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}">
                         <field name="scop_period_ids" mode="tree"
                                 context="{'default_partner_id': active_id, 'default_name': name, 'default_cooperative_form_id': cooperative_form_id, 'default_partner_company_type_id': partner_company_type_id, 'default_siret': siret, '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_naf_id': naf_id, 'default_cae': cae}" style="pointer-events:none;">
                             <tree string="Périodes" decoration-muted="end_reason!=False" create="false" edit="false" delete="false">
@@ -615,10 +623,7 @@
                             </tree>
                         </field>
                     </page>
-                            <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')]}">
+                    <page name='scop_membership' string="Périodes d'adhésion" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}">
                         <field name="membership_period_ids" mode="tree" style="pointer-events:none;">
                             <tree create="false" edit="false" delete="false" default_order="start desc">
                                 <field name="start"/>
@@ -631,7 +636,7 @@
                             </tree>
                         </field>
                     </page>
-                            <page name='scop_contribution' string="Cotisations" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
+                    <page name='scop_contribution' string="Cotisations" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}">
                         <field name="contribution_ids" mode="tree" style="pointer-events:none;">
                             <tree create="false" edit="false" delete="false" default_order="calculation_date desc">
                                 <field name="type_id"/>
@@ -652,7 +657,7 @@
                             </tree>
                         </field>
                     </page>
-                            <page name='scop_staff' string="Effectifs" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
+                    <page name='scop_staff' string="Effectifs" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}">
                             <field name="staff_ids" mode="tree" context="{'default_partner_id': active_id, 'default_type_entry': 'regul_ur'}">
                                 <tree delete="false" default_order="effective_date desc" editable="top">
                                     <field name="effective_date"  attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/>
@@ -665,9 +670,8 @@
                                 </tree>
                             </field>
                         </page>
-                        </notebook>
-                    </div>
                 </xpath>
+
             </field>
         </record>