diff --git a/wizard/scop_membership_out_wizard.py b/wizard/scop_membership_out_wizard.py index ff93026c6684def0a792a6dd4c3321c3b9b5d4db..e69e308d161c02dd08a506614a7b1bb32fb7e859 100644 --- a/wizard/scop_membership_out_wizard.py +++ b/wizard/scop_membership_out_wizard.py @@ -31,39 +31,47 @@ class ScopMembershipOutWizard(models.TransientModel): required=True) note = fields.Text('Commentaires') - + #............................................................ # Fermeture des périodes #............................................................ @api.multi def member_out(self): - for period in self: - # On veut cloture toute les périodes if (period.type_all): last_periods = self.env['scop.membership.period'].search( [('partner_id', '=', period.partner_id),('end', '=', False)]) for lp in last_periods: period_type_id = lp.type_id.id - period.member_out_period(period.partner_id, period_type_id, period.end, period.end_reason_id.id, period.note) - + period.member_out_period( + period.partner_id, + period_type_id, + period.end, + period.end_reason_id.id, + period.note) # On ne veut cloturer qu'une seule période else: period_type_id = period.type_id.id - period.member_out_period(period.partner_id, period_type_id, period.end, period.end_reason_id.id, period.note) - - return + period.member_out_period( + period.partner_id, + period_type_id, + period.end, + period.end_reason_id.id, + period.note) + return #............................................................ # Fermeture d'une période #............................................................ - def member_out_period(self, partner_id, period_type_id, end, end_reason_id, note): + def member_out_period(self, partner_id, period_type_id, + end, end_reason_id, note): # Lecture de la dernière période active - last_period = self.env['scop.membership.period'].search( - [('partner_id', '=', partner_id), - ('end', '=', False), ('type_id', '=', period_type_id)], + last_period = self.env['scop.membership.period'].search([ + ('partner_id', '=', partner_id), + ('end', '=', False), + ('type_id', '=', period_type_id)], limit=1) if last_period: if end >= last_period.start: @@ -82,4 +90,3 @@ class ScopMembershipOutWizard(models.TransientModel): "Il n'existe pas de période avec ce type à fermer.") return -