From f2b7903bba8fedff1ce0ec739139b03b04d4086f Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Wed, 8 Feb 2023 14:43:39 +0100 Subject: [PATCH] [update] delete member_start_stat and start_stat fields --- models/res_partner.py | 7 +------ models/scop_membership.py | 1 - views/res_partner.xml | 2 +- views/res_partner_cooperative.xml | 5 ----- views/scop_period_views.xml | 2 +- wizard/scop_membership_period_wizard.py | 10 ---------- wizard/scop_membership_period_wizard.xml | 1 - 7 files changed, 3 insertions(+), 25 deletions(-) diff --git a/models/res_partner.py b/models/res_partner.py index f02885d..3b55f10 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -102,11 +102,6 @@ class ScopPartner(models.Model): "No adhérent", 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 ) @@ -985,6 +980,7 @@ class ScopPartner(models.Model): "membership_period_ids", "membership_period_ids.end_reason_id", "membership_period_ids.end", + "membership_period_ids.start", ) def _compute_membership(self): for partner in self: @@ -997,7 +993,6 @@ class ScopPartner(models.Model): ) if last_membership_period and not last_membership_period.end: partner.membership_status = "member" - 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/models/scop_membership.py b/models/scop_membership.py index e033562..5c85ff5 100644 --- a/models/scop_membership.py +++ b/models/scop_membership.py @@ -24,7 +24,6 @@ class ScopMembershipPeriod(models.Model): index=True, ) start = fields.Date("Début d’adhésion", index=True) - start_stat = fields.Date("Début d’adhésion stat.", index=True) end = fields.Date("Fin d’adhésion") end_reason_id = fields.Many2one( "scop.membership.reason.end", diff --git a/views/res_partner.xml b/views/res_partner.xml index a406a73..70bfb7b 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -1533,7 +1533,7 @@ <field name="start" /> <field name="type_id" /> <field name="number" /> - <field name="start_stat" /> + <field name="start" /> <field name="end" /> <field name="end_reason_id" /> <field name="note" /> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 15e3814..f46d587 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -79,11 +79,6 @@ 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" diff --git a/views/scop_period_views.xml b/views/scop_period_views.xml index 1fb0c84..1e806ae 100644 --- a/views/scop_period_views.xml +++ b/views/scop_period_views.xml @@ -104,7 +104,7 @@ options="{'no_open': True, 'no_create': True}" /> <field name="number" /> - <field name="start_stat" /> + <field name="start" /> <field name="end" /> <field name="end_reason_id" diff --git a/wizard/scop_membership_period_wizard.py b/wizard/scop_membership_period_wizard.py index 95b8e8c..3929a95 100644 --- a/wizard/scop_membership_period_wizard.py +++ b/wizard/scop_membership_period_wizard.py @@ -28,9 +28,6 @@ class ScopMembershipPeriodWizard(models.TransientModel): required=True, ) start = fields.Date("Début d’adhésion", required=True, default=fields.Date.today()) - start_stat = fields.Date( - "Début d’adhésion stat.", required=True, default=fields.Date.today() - ) number = fields.Char("No adhérent", required=True, default=_default_number) note = fields.Text("Commentaires") @@ -54,14 +51,7 @@ class ScopMembershipPeriodWizard(models.TransientModel): "partner_id": period.partner_id, "type_id": period.type_id.id, "start": period.start, - "start_stat": period.start_stat, "number": period.number, "note": period.note, } ) - - @api.onchange("start") - def onchange_start(self): - for rec in self: - if rec.start: - rec.start_stat = rec.start diff --git a/wizard/scop_membership_period_wizard.xml b/wizard/scop_membership_period_wizard.xml index 8b5d0f0..e04dd38 100644 --- a/wizard/scop_membership_period_wizard.xml +++ b/wizard/scop_membership_period_wizard.xml @@ -12,7 +12,6 @@ options="{'no_open': True, 'no_create': True}" /> <field name="start" /> - <field name="start_stat" /> <field name="number" /> <field name="note" /> </group> -- GitLab