modifs suite retour herve

models/res_partner.py

@@ -89,7 +89,7 @@ class ScopPartner(models.Model):
         'Date 1er signature coop')
     registration_date = fields.Date(
         string="Date d'immatriculation RCS")
-    social_object = fields.Char('Objet Social')
+    social_object = fields.Text('Objet Social')
     naf_id = fields.Many2one(
         'res.partner.naf',
         string='Code NAF',
@@ -118,7 +118,8 @@ class ScopPartner(models.Model):
         string='Mois clôture exercices', default=12)
     is_seed_scop = fields.Boolean("Est une SCOP d'amorçage")
     seed_end = fields.Date("Date de fin du dispositif d'amorçage",
-                           default=str(datetime.today() + timedelta(2556)))
+                           default=str(datetime.today() + timedelta(2556)),
+                           compute='_compute_seen_end')
     is_incubated = fields.Boolean("Est incubé")
     incubator_id = fields.Many2one(
         'res.partner',
@@ -329,6 +330,14 @@ class ScopPartner(models.Model):
             if company.siret:
                 company.siren = company.siret[:9]
 
+    @api.model
+    def _compute_seen_end(self):
+        for company in self:
+            if company.date_1st_sign:
+                company.seed_end = company.date_1st_sign + timedelta(2556)
+            else:
+                company.seed_end = str(datetime.today() + timedelta(2556))
+
 
 class ResPartneCertification(models.Model):
     _name = "res.partner.certification"

static/src/css/style.css

@@ -13,3 +13,7 @@
 .o_field_header{
     margin-right: 20px !important;
 }
+
+.o_form_view .o_group.o_inner_group > tbody > tr > td.o_td_label{
+	min-width: 240px !important;
+}
\ No newline at end of file

views/res_partner.xml

@@ -4,6 +4,36 @@
 
 <odoo>
     <data>
+        <record id="view_res_partner_filter_contacts" model="ir.ui.view">
+            <field name="name">res.partner.select.contact</field>
+            <field name="model">res.partner</field>
+            <field name="arch" type="xml">
+                <search string="Search Partner">
+                   <field name="name" filter_domain="['|','|',('display_name','ilike',self),('ref','=',self),('email','ilike',self)]"/>
+                   <field name="parent_id" domain="[('is_company','=',True)]" operator="child_of"/>
+                   <filter name="filter_my_partners" help="Mes Contacts" domain="[('user_id','=',uid)]"/>
+                   <separator/>
+                   <filter string="Archivés" name="inactive" domain="[('active','=',False)]"/>
+                   <separator/>
+                    <filter string="Mes Activités" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
+                    <separator/>
+                    <filter string="Activités en retard" name="activities_overdue" domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]" help="Show all records which has next action date is before today"/>
+                    <filter string="Activités du Jour" name="activities_today" domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                    <filter string="Activités futures" name="activities_upcoming_all" domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))                         ]"/>
+                    <separator/>
+                   <field name="category_id" string="Tag" filter_domain="[('category_id','ilike', self)]"/>
+                   <field name="user_id"/>
+                   <field name="phone" filter_domain="['|',('phone','ilike',self),('mobile','=',self)]"/>
+                   <group expand="0" name="group_by" string="Group By">
+                       <filter name="salesperson" string="Salesperson" domain="[]" context="{'group_by' : 'user_id'}"/>
+                       <filter name="group_company" string="Company" context="{'group_by': 'parent_id'}"/>
+                       <filter name="group_country" string="Country" context="{'group_by': 'country_id'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
+
         <record id="view_partner_address_french" model="ir.ui.view">
             <field name="name">french.address</field>
             <field name="model">res.partner</field>
@@ -142,7 +172,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="base.view_res_partner_filter"/>
+            <field name="search_view_id" ref="view_res_partner_filter_contacts"/>
             <field name="context">{'search_default_type_person': 1}</field>
             <field name="view_ids" eval="[(5, 0, 0),
                 (0, 0, {'view_mode': 'tree', 'view_id': ref('base.view_partner_tree')}),
@@ -156,7 +186,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="base.view_res_partner_filter"/>
+            <field name="search_view_id" ref="view_res_partner_filter_contacts"/>
             <field name="context">{'search_default_type_company': 1}</field>
             <field name="view_ids" eval="[(5, 0, 0),
                 (0, 0, {'view_mode': 'tree', 'view_id': ref('base.view_partner_tree')}),

views/res_partner_cooperative.xml

@@ -10,17 +10,18 @@
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
                     <filter name="type_person" position="replace">
-                        <filter string="Personnes" name="type_person" domain="[('is_company','=',False)]"/>
                     </filter>
                     <filter name="type_company" position="replace">
-                        <filter string="Partenaires" name="type_company" domain="[('is_company','=',True),('is_cooperative','=',False)]"/>
                         <filter string="Prospects" name="type_prospect" domain="[('is_company','=',True),('is_cooperative','=',True),('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion'))]"/>
                         <filter string="Coopératives" name="type_cooperative" domain="[('is_company','=',True),('is_cooperative','=',True),('project_status','=','5_suivi')]"/>
                         <filter string="Organismes" name="type_organisme" domain="[('is_company','=',True),('is_cooperative','=',True)]"/>
                     </filter>
+                    <filter name="customer" position="replace"></filter>
+                    <filter name="supplier" position="replace"></filter>
             </field>
         </record>
 
+
         <record id="view_partner_cooperative_tree" model="ir.ui.view">
             <field name="name">cooperative.tree</field>
             <field name="model">res.partner</field>
@@ -53,6 +54,7 @@
                     <attribute name="group_create">false</attribute>
                     <attribute name="group_edit">false</attribute>
                     <attribute name="group_delete">false</attribute>
+                    <attribute name="quick_create">false</attribute>
                 </xpath>
                 <xpath expr="//kanban/field[@name='type']" position="after">
                     <field name="activity_ids" />
@@ -73,7 +75,7 @@
                 <form string="Cooperatives">
                     <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)]}"/>
-                        <field name="project_status" widget="statusbar" options="{'clickable': '0'}" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion,5_suivi"/>
+                        <field name="project_status" widget="statusbar" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion,5_suivi"/>
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
@@ -565,7 +567,8 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
-            <field name="search_view_id" ref="base.view_res_partner_filter"/>
+            <!-- <field name="search_view_id" ref="base.view_res_partner_filter"/> -->
+            <field name="search_view_id" ref="cgscop_partner.res_partner_view_search_inherit_scop"/>
             <field name="domain" eval="[('is_cooperative', '=', True),('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion'))]"/>
             <field name="view_ids" eval="[(5, 0, 0),
                 (0, 0, {'view_mode': 'kanban', 'view_id': ref('view_partner_cooperative_kanban')}),
@@ -580,7 +583,8 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="base.view_res_partner_filter"/>
+            <!-- <field name="search_view_id" ref="base.view_res_partner_filter"/> -->
+            <field name="search_view_id" ref="cgscop_partner.res_partner_view_search_inherit_scop"/>
             <field name="domain" eval="[('is_cooperative', '=', True),('project_status','=','5_suivi')]"/>
             <field name="view_ids" eval="[(5, 0, 0),
                 (0, 0, {'view_mode': 'tree', 'view_id': ref('base.view_partner_tree')}),