From 9f36b0a36598f76bba36180b2b10a34a07295165 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Mon, 29 Jul 2019 18:19:21 +0200 Subject: [PATCH] [FIX]GOLEM Registration Payment : bad domains Were made from onchange and not using is_default anymore. --- golem_activity_registration/__manifest__.py | 2 +- .../models/golem_activity_registration.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/golem_activity_registration/__manifest__.py b/golem_activity_registration/__manifest__.py index a947633..e5b060b 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.3', + 'version': '10.0.1.6.4', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_activity_registration/models/golem_activity_registration.py b/golem_activity_registration/models/golem_activity_registration.py index e6d6025..a2e83f4 100644 --- a/golem_activity_registration/models/golem_activity_registration.py +++ b/golem_activity_registration/models/golem_activity_registration.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright 2017-2018 Fabien Bourgeois +# Copyright 2017-2019 Fabien Bourgeois # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -95,7 +95,7 @@ class GolemActivityRegistration(models.Model): @api.onchange('activity_id', 'activity_id.only_for_subscriber') def onchange_activity_subcrib(self): """ If activity only for subscribers : do not allow non subscribers """ - domain = [] + domain = [('is_default', '=', True)] if self.activity_id.only_for_subscriber: domain.append(('membership_state', 'not in', ('none', 'canceled', 'old'))) return {'domain': {'member_id': domain}} @@ -103,7 +103,7 @@ class GolemActivityRegistration(models.Model): @api.onchange('member_id') def onchange_member_subcrib(self): """ If not subscriber : do not show subscribers only activities """ - domain = [] + domain = [('is_default', '=', True)] if self.member_id and self.member_id.membership_state in ('none', 'canceled', 'old'): domain.append(('only_for_subscriber', '=', False)) return {'domain': {'activity_id': domain}}