diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 035b7eac57b..be23605b4fb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -640,12 +640,6 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
print "";
- // Ref
- print '
';
- $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
- print $taskstatic->getNomUrl(1,'withproject');
- print ' | ';
-
if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
{
// Thirdparty
@@ -656,6 +650,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
print '';
}
+ // Ref
+ print '';
+ $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+ print $taskstatic->getNomUrl(1, 'withproject', 'time');
+ print ' | ';
+
// Label task
print "";
for ($k = 0 ; $k < $level ; $k++) print " ";
@@ -663,7 +663,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
$taskstatic->ref=$lines[$i]->label;
$taskstatic->date_start=$lines[$i]->date_start;
$taskstatic->date_end=$lines[$i]->date_end;
- print $taskstatic->getNomUrl(0,'withproject');
+ print $taskstatic->getNomUrl(0, 'withproject', 'time');
//print " ";
//for ($k = 0 ; $k < $level ; $k++) print " ";
//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 9f5a69941b1..64ced5f3a5a 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -241,13 +241,14 @@ if ($action == 'addtime' && $user->rights->projet->lire)
$object->timespent_note = GETPOST($key.'note');
if (GETPOST($key."hour") != '' && GETPOST($key."hour") >= 0) // If hour was entered
{
- $object->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,$monthofday,$dayofday,$yearofday);
+ $object->timespent_datehour = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,$monthofday,$dayofday,$yearofday);
$object->timespent_withhour = 1;
}
else
{
- $object->timespent_date = dol_mktime(12,0,0,$monthofday,$dayofday,$yearofday);
+ $object->timespent_datehour = dol_mktime(12,0,0,$monthofday,$dayofday,$yearofday);
}
+ $object->timespent_date = $object->timespent_datehour;
if ($object->timespent_date > 0)
{
|