From 1561a47a838efd57181bddabecac01b04b136a8d Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Mon, 21 Jan 2019 17:03:36 +0100 Subject: [PATCH] [FIX]GOLEM Member / Registration analysis fix on reusing current Current analysis will add / double results with now truncate. --- golem_activity_registration/__manifest__.py | 2 +- .../wizard/golem_activity_registration_analysis_wizard.py | 5 +++++ golem_member/__manifest__.py | 2 +- golem_member/wizard/golem_member_analysis_wizard.py | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/golem_activity_registration/__manifest__.py b/golem_activity_registration/__manifest__.py index 8dfac21..150c357 100644 --- a/golem_activity_registration/__manifest__.py +++ b/golem_activity_registration/__manifest__.py @@ -18,7 +18,7 @@ { 'name': 'GOLEM Activity Member Registrations', 'summary': 'GOLEM Activities Member Registrations management', - 'version': '10.0.1.6.0', + 'version': '10.0.1.6.1', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py b/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py index 275e9b7..621b2fd 100644 --- a/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py +++ b/golem_activity_registration/wizard/golem_activity_registration_analysis_wizard.py @@ -79,6 +79,11 @@ class GolemActivityRegistrationAnalysisWizard(models.TransientModel): """ registration analyse """ self.ensure_one() analysis_rec = self[0] + # Remove existing analysis lines for current analysis + self.env['golem.member.analysis'].search( + [('resgistration_analysis_id', '=', analysis_rec.id)] + ).unlink() + registrations = analysis_rec.get_registrations() if registrations: for registration in registrations: diff --git a/golem_member/__manifest__.py b/golem_member/__manifest__.py index a42d576..43bd205 100644 --- a/golem_member/__manifest__.py +++ b/golem_member/__manifest__.py @@ -21,7 +21,7 @@ 'name': 'GOLEM non-profit members', 'summary': 'Extends Odoo contacts for MJC', 'description': 'Extends Odoo contacts for MJC', - 'version': '10.0.2.7.1', + 'version': '10.0.2.7.2', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_member/wizard/golem_member_analysis_wizard.py b/golem_member/wizard/golem_member_analysis_wizard.py index 8f8aced..124843d 100644 --- a/golem_member/wizard/golem_member_analysis_wizard.py +++ b/golem_member/wizard/golem_member_analysis_wizard.py @@ -91,6 +91,11 @@ class GolemMemberAnalysis(models.TransientModel): """ members analyse """ self.ensure_one() analysis_rec = self[0] + # Remove existing analysis lines for current analysis + self.env['golem.member.analysis'].search( + [('member_analysis_id', '=', analysis_rec.id)] + ).unlink() + members = analysis_rec.get_members() if members: for member in members: