diff --git a/models/res_partner.py b/models/res_partner.py index 1e9bffb5aa3db0eff240d0700fccf1aff8ed0482..9402d9b36571a7f21b5847b3af48697b568d57fa 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -322,6 +322,14 @@ class ScopPartner(models.Model): comodel_name='scop.questionnaire', inverse_name='partner_id', string='Listes Ministère') + staff_last = fields.Integer( + string="Dernier effectif connu", + compute="_compute_last_effective", + store=True) + staff_last_date = fields.Date( + string="Date dernier effectif connu", + compute="_compute_last_effective", + store=True) # Liasse fiscale liasse_fiscale_ids = fields.One2many( @@ -676,6 +684,17 @@ class ScopPartner(models.Model): else: partner.membership_status = "not_member" + @api.depends('questionnaire_ids') + @api.multi + def _compute_last_effective(self): + for partner in self: + lm = partner.questionnaire_ids.sorted( + key=lambda r: r.effective_date, reverse=True) + if lm: + partner.staff_last = lm[0].staff_count + partner.staff_last_date = lm[0].effective_date + + class ResPartneCertification(models.Model): _name = "res.partner.certification" diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 2d8618d87fb03f9d698845865f972796adc627da..fd4a91feacf4b0ba4c50511911e563d5b0467bea 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -275,6 +275,8 @@ <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="staff_last" /> + <field name="staff_last_date" /> </group> </group> <notebook colspan="4"> @@ -352,6 +354,7 @@ <field name="state_id"/> <field name="country_id"/> <field name="type"/> + <field name="category_id"/> </group> <group> <field name="title" placeholder="Madame"/> @@ -422,6 +425,7 @@ <field name="display_name"/> <field name="supplier"/> <field name="ur_id"/> + <field name="category_id"/> <templates> <t t-name="kanban-box"> <t t-set="color" t-value="kanban_color(record.color.raw_value)"/> @@ -453,6 +457,7 @@ </div> <div t-if="record.phone.raw_value">Phone: <field name="phone"/></div> <div t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></div> + <div t-if="record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div> </div> </div> </t> @@ -601,7 +606,7 @@ </page> <page name='scop_membership' string="Périodes d'adhésion" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> <field name="membership_period_ids" mode="tree" style="pointer-events:none;"> - <tree create="false" edit="false" delete="false"> + <tree create="false" edit="false" delete="false" default_order="start desc"> <field name="start"/> <field name="type_id"/> <field name="number"/> @@ -625,7 +630,7 @@ </group> </group> <field name="contribution_ids" mode="tree" style="pointer-events:none;"> - <tree create="false" edit="false" delete="false"> + <tree create="false" edit="false" delete="false" default_order="calculation_date desc"> <field name="type_id"/> <field name="year"/> <field name="calculation_date"/> @@ -649,7 +654,7 @@ <field name="direccte_id" widget="res_partner_many2one" options="{'no_create': True}"/> </group> <field name="questionnaire_ids" mode="tree" style="pointer-events:none;"> - <tree create="false" edit="false" delete="false"> + <tree create="false" edit="false" delete="false" default_order="effective_date desc"> <field name="year"/> <field name="type_id"/> <field name="effective_date"/> @@ -661,7 +666,7 @@ </page> <page name='scop_liasse_fiscale' string="Liasses Fiscales" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> <field name="liasse_fiscale_ids" mode="tree"> - <tree create="false" edit="false" delete="false"> + <tree create="false" edit="false" delete="false" default_order="effective_date desc"> <field name="year"/> <field name="type_id"/> <field name="effective_date"/>