diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 479e46258be..7cb0e35e463 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -666,6 +666,11 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou")); print ''; + print ''; + print ''; + print ''; + print "\n"; } diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 7e23fe123d0..ada7e0bb7d4 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010 François Legastelois * @@ -192,9 +192,10 @@ if ($action == 'addtime' && $user->rights->projet->creer) foreach($timespent_duration as $key => $val) { $object->fetch($key); - $object->progress = GETPOST($key . 'progress', 'int'); + $object->progress = GETPOST($key.'progress', 'int'); $object->timespent_duration = $val; $object->timespent_fk_user = $user->id; + $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); @@ -385,6 +386,7 @@ if ($usertoprocess->id == $user->id) print ''.$langs->trans("T else print ''.$langs->trans("TimeSpentByUser").''; print ''.$langs->trans("HourStart").''; print ''.$langs->trans("Duration").''; +print ''.$langs->trans("Note").''; print "\n"; // By default, we can edit only tasks we are assigned to