diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 7d87dbae298..480294607f6 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -201,65 +201,68 @@ if ($db->type != 'pgsql')
}
-// TODO Do not use week function to be compatible with all database
+/*
if ($db->type != 'pgsql')
{
+ print '
';
+
+ // Affichage de la liste des projets de la semaine
+ print '
';
+ print '';
+ print '| '.$langs->trans("ActivityOnProjectThisWeek").' | ';
+ print ''.$langs->trans("Time").' | ';
+ print "
\n";
+
+ $sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
+ $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
+ $sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
+ $sql.= " WHERE t.fk_projet = p.rowid";
+ $sql.= " AND p.entity = ".$conf->entity;
+ $sql.= " AND tt.fk_task = t.rowid";
+ $sql.= " AND tt.fk_user = ".$user->id;
+ $sql.= " AND task_date >= '".dol_get_first_day($year, $month).'" AND ...";
+ $sql.= " AND p.rowid in (".$projectsListId.")";
+ $sql.= " GROUP BY p.rowid, p.ref, p.title";
+
+ $resql = $db->query($sql);
+ if ( $resql )
+ {
+ $total = 0;
+ $var=true;
+
+ while ($row = $db->fetch_object($resql))
+ {
+ $var=!$var;
+ print "";
+ print '| ';
+ $projectstatic->id=$row->rowid;
+ $projectstatic->ref=$row->ref;
+ $projectstatic->title=$row->title;
+ print $projectstatic->getNomUrl(1, '', 1);
+ print ' | ';
+ print ''.convertSecondToTime($row->nb, 'allhourmin').' | ';
+ print "
\n";
+ $total += $row->nb;
+ }
+
+ $db->free($resql);
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ print '';
+ print '| '.$langs->trans('Total').' | ';
+ print ''.convertSecondToTime($total, 'allhourmin').' | ';
+ print "
\n";
+ print "
";
+
+}
+*/
+
print '
';
-/* Affichage de la liste des projets de la semaine */
-print '';
-print '';
-print '| '.$langs->trans("ActivityOnProjectThisWeek").' | ';
-print ''.$langs->trans("Time").' | ';
-print "
\n";
-
-$sql = "SELECT p.rowid, p.ref, p.title, SUM(tt.task_duration) as nb";
-$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
-$sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
-$sql.= " WHERE t.fk_projet = p.rowid";
-$sql.= " AND p.entity = ".$conf->entity;
-$sql.= " AND tt.fk_task = t.rowid";
-$sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND week(task_date) = '".strftime("%W",time())."'";
-$sql.= " AND p.rowid in (".$projectsListId.")";
-$sql.= " GROUP BY p.rowid, p.ref, p.title";
-
-$resql = $db->query($sql);
-if ( $resql )
-{
- $total = 0;
- $var=true;
-
- while ($row = $db->fetch_object($resql))
- {
- $var=!$var;
- print "";
- print '| ';
- $projectstatic->id=$row->rowid;
- $projectstatic->ref=$row->ref;
- $projectstatic->title=$row->title;
- print $projectstatic->getNomUrl(1, '', 1);
- print ' | ';
- print ''.convertSecondToTime($row->nb, 'allhourmin').' | ';
- print "
\n";
- $total += $row->nb;
- }
-
- $db->free($resql);
-}
-else
-{
- dol_print_error($db);
-}
-print '';
-print '| '.$langs->trans('Total').' | ';
-print ''.convertSecondToTime($total, 'allhourmin').' | ';
-print "
\n";
-print "
";
-
-}
-
/* Affichage de la liste des projets du mois */
print '';
print '';
@@ -275,7 +278,7 @@ $sql.= " WHERE t.fk_projet = p.rowid";
$sql.= " AND p.entity = ".$conf->entity;
$sql.= " AND tt.fk_task = t.rowid";
$sql.= " AND tt.fk_user = ".$user->id;
-$sql.= " AND date_format(task_date,'%y-%m') = '".strftime("%y-%m",$now)."'";
+$sql.= " AND task_date BETWEEN '".dol_get_first_day($year, $month).'" AND "'.dol_get_last_day($year, $month)."'";
$sql.= " AND p.rowid in (".$projectsListId.")";
$sql.= " GROUP BY p.rowid, p.ref, p.title";