From 8e1f4051af65ba572210a5b342b728ec54709a34 Mon Sep 17 00:00:00 2001 From: Remi <remi@le-filament.com> Date: Fri, 28 Feb 2020 15:16:14 +0100 Subject: [PATCH] [cgscop#139] no sum on member --- models/res_partner.py | 4 ++-- views/res_partner.xml | 2 +- views/res_partner_cooperative.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/res_partner.py b/models/res_partner.py index c5b18bd..2e35b7f 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -57,11 +57,11 @@ class ScopPartner(models.Model): string="Statut d'adhésion", compute='_compute_membership', store=True) member_number = fields.Char( - "No adhérent", + "No adhérent (texte)", compute='_compute_membership', store=True) member_number_int = fields.Integer( "No adhérent", - compute='_compute_membership_int', store=True) + compute='_compute_membership_int', store=True, group_operator="") cae = fields.Boolean("CAE", track_visibility='onchange') dissolution_date = fields.Date('Date de Décès', diff --git a/views/res_partner.xml b/views/res_partner.xml index e278aae..76bd648 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -283,7 +283,7 @@ <field name="membership_status" readonly="True" class="o_field_header"/> </h3> <h3> - <field name="member_number" readonly="True" class="o_field_header"/> + <field name="member_number_int" readonly="True" class="o_field_header"/> </h3> <h3> <span name="cae" class="o_field_widget o_readonly_modifier o_field_header oe_read_only" attrs="{'invisible':[('cae','=',False)]}">CAE</span> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index ea0cb4d..739e6ba 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -13,7 +13,7 @@ <field name="phone" filter_domain="['|',('phone','ilike',self),('mobile','=',self)]"/> <field name="segment_1_id" string="Segmentation" filter_domain="['|', '|', '|', ('segment_1_id','ilike', self), ('segment_2_id','ilike', self), ('segment_3_id','ilike', self), ('segment_4_id','ilike', self)]"/> <field name="followup_delegate_id" string="Délégué" filter_domain="['|', '|', '|', ('followup_delegate_id', 'ilike', self), ('creation_delegate_id', 'ilike', self), ('revision_person_id', 'ilike', self), ('revision_certified_person_id', 'ilike', self)]"/> - <field name="member_number" filter_domain="[('member_number','ilike',self)]"/> + <field name="member_number_int" filter_domain="[('member_number','ilike',self)]"/> <field name="siret" filter_domain="[('siret','ilike',self)]"/> <field name="sigle" filter_domain="[('sigle','ilike',self)]"/> <filter string="Mes organismes" name="my_partners" domain="['|', ('creation_delegate_id','=',uid), ('followup_delegate_id','=',uid)]"/> @@ -85,7 +85,7 @@ <field name="arch" type="xml"> <tree string="Organismes"> <field name="display_name" string="Raison Sociale"/> - <field name="member_number"/> + <field name="member_number_int"/> <field name="cooperative_form_id"/> <field name="naf_id"/> <field name="zip"/> -- GitLab