lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix filter on member without subscription

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-15 13:41:15 +02:00
parent 54c5ca7c75
commit 63a62edcf6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/list.php
View File

@ -365,7 +365,7 @@ if ($search_type > 0) {
$sql .= " AND t.rowid=".((int) $search_type); $sql .= " AND t.rowid=".((int) $search_type);
} }
if ($search_filter == 'withoutsubscription') { if ($search_filter == 'withoutsubscription') {
$sql .= " AND (datefin IS NULL OR t.subscription = '0')"; $sql .= " AND (datefin IS NULL)";
} }
if ($search_filter == 'uptodate') { if ($search_filter == 'uptodate') {
$sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = '0')"; $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = '0')";

2
htdocs/partnership/partnership_list.php
View File

@ -359,7 +359,7 @@ foreach ($search as $key => $val) {
} }
if ($managedfor == 'member') { if ($managedfor == 'member') {
if ($search_filter == 'withoutsubscription') { if ($search_filter == 'withoutsubscription') {
$sql .= " AND (d.datefin IS NULL OR dty.subscription = 0)"; $sql .= " AND (d.datefin IS NULL)";
} }
if ($search_filter == 'uptodate') { if ($search_filter == 'uptodate') {
$sql .= " AND (d.datefin >= '".$db->idate($now)."' OR dty.subscription = 0)"; $sql .= " AND (d.datefin >= '".$db->idate($now)."' OR dty.subscription = 0)";