From ea98e758d0db11ddb3d09b810a2aa1f775038b32 Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Mon, 20 Dec 2021 10:33:35 +0100 Subject: [PATCH] [add] membership date --- models/res_partner.py | 4 ++++ views/res_partner_cooperative.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/models/res_partner.py b/models/res_partner.py index 665c0eb..9c35016 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -63,6 +63,9 @@ class ScopPartner(models.Model): "No adhérent", compute='_compute_membership_int', store=True, group_operator="") member_start_stat = fields.Date( + "Date d'adhésion statistique", + compute='_compute_membership', store=True) + member_start = fields.Date( "Date d'adhésion", compute='_compute_membership', store=True) cae = fields.Boolean("CAE", track_visibility='onchange') @@ -824,6 +827,7 @@ class ScopPartner(models.Model): partner.membership_status = "member" partner.member_number = last_membership_period.number partner.member_start_stat = last_membership_period.start_stat + partner.member_start = last_membership_period.start 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 8b3d933..81c8ef2 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -26,7 +26,8 @@ <filter string="Adhérents de mon UR" name="my_ur_adherent" domain="[('current_user_ur_id', '=', 'ur_id'), ('membership_status', '=', 'member')]"/> <separator/> <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="Adhésions cette année" name="member_start_this_year" domain="[('member_start','<=', time.strftime('%%Y-12-31')),('member_start','>=',time.strftime('%%Y-01-01'))]"/> + <filter string="Adhésions cette année (stat)" 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/> -- GitLab