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

Ignore dateo/datee if is a null column

Browse Source
This commit is contained in:
Cubexed 2014-09-12 16:46:19 +02:00
parent c23fab267c
commit 71a1857b49
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/project.lib.php
View File

@ -689,7 +689,7 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $sta
if (empty($project_year_filter) || !ctype_digit($project_year_filter)) { // if (empty($project_year_filter) || !ctype_digit($project_year_filter)) { //
$project_year_filter = date("Y"); $project_year_filter = date("Y");
} }
$sql.= " AND (YEAR(p.datec) <= ".$project_year_filter." AND YEAR(p.datee) >= ".$project_year_filter.")"; $sql.= " AND (p.datee IS NULL OR YEAR(p.dateo) <= ".$project_year_filter.") AND (p.datee IS NULL OR YEAR(p.datee) >= ".$project_year_filter.")";
} }
} }
$sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut"; $sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut";