rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-08 15:14:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_noncotisation_articles_in_forms' into 'dev'

Browse source 
Fix availability of non cotisation articles in facture creation.

See merge request re2o/re2o!557
This commit is contained in:
chirac 2020-09-01 22:25:38 +02:00
parent d5cfe2edd2 0f6cf2a43b
commit 692da0dfae
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cotisations/models.py
View file

@ -778,7 +778,7 @@ class Article(RevMixin, AclMixin, models.Model):
Args: Args:
user: The user requesting articles. user: The user requesting articles.
target_user: The user to sell articles target_user: The user to sell articles to
""" """
if target_user is None: if target_user is None:
objects_pool = cls.objects.all() objects_pool = cls.objects.all()
@ -790,7 +790,9 @@ class Article(RevMixin, AclMixin, models.Model):
) )
if target_user is not None and not target_user.is_adherent(): if target_user is not None and not target_user.is_adherent():
objects_pool = objects_pool.filter( objects_pool = objects_pool.filter(
Q(type_cotisation="All") | Q(type_cotisation="Adhesion") Q(type_cotisation="All")
| Q(type_cotisation="Adhesion")
| Q(type_cotisation__isnull=True)
) )
if user.has_perm("cotisations.buy_every_article"): if user.has_perm("cotisations.buy_every_article"):
return objects_pool return objects_pool