diff --git a/models/res_partner.py b/models/res_partner.py index 7beb53b27c084ab84cbacf77805237c4e8221f22..665c0eb079b5fabe9007a6ac1ec0aeff7ae9746d 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -62,6 +62,9 @@ class ScopPartner(models.Model): member_number_int = fields.Integer( "No adhérent", compute='_compute_membership_int', store=True, group_operator="") + member_start_stat = fields.Date( + "Date d'adhésion", + compute='_compute_membership', store=True) cae = fields.Boolean("CAE", track_visibility='onchange') dissolution_date = fields.Date('Date de Décès', @@ -820,6 +823,7 @@ class ScopPartner(models.Model): and not last_membership_period.end): partner.membership_status = "member" partner.member_number = last_membership_period.number + partner.member_start_stat = last_membership_period.start_stat elif (last_membership_period and last_membership_period.end_reason_id): partner.membership_status = "out" diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 55feed67205c7e2f2a4ff96e0091d7ec07d17b99..8b3d93378fce0e737a8a53a6985f89c503efb97f 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -25,7 +25,9 @@ <filter string="Adhérents" name="is_adherent" domain="[('membership_status', '=', 'member')]"/> <filter string="Adhérents de mon UR" name="my_ur_adherent" domain="[('current_user_ur_id', '=', 'ur_id'), ('membership_status', '=', 'member')]"/> <separator/> - <filter string="Coop. non Adhérentes, non décédées" name="is_not_member" domain="[('membership_status', '=', 'not_member'),('dissolution_date', '=', False)]"/> + <filter string="Créations cette année" name="date_1st_sign_this_year" domain="[('date_1st_sign','<=', time.strftime('%%Y-12-31')),('date_1st_sign','>=',time.strftime('%%Y-01-01'))]"/> + <filter string="Adhésions cette année" name="member_start_stat_this_year" domain="[('member_start_stat','<=', time.strftime('%%Y-12-31')),('member_start_stat','>=',time.strftime('%%Y-01-01'))]"/> + <filter string="Coop. non Adhérentes, non décédées" name="is_not_member" domain="[('membership_status', '=', 'not_member'),('dissolution_date', '=', False)]"/> <filter string="Adhérents radiés, non décédés" name="is_out" domain="[('membership_status', '=', 'out'),('dissolution_date', '=', False)]"/> <separator/> <filter string="Archivés" name="inactive" domain="[('active','=',False)]"/>