diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f39856f1bc1..16e78d24414 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1811,7 +1811,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
if ($projectstatic->title)
{
print ' - ';
- print $projectstatic->title;
+ print ''.$projectstatic->title.'';
}
print '';
print '';
@@ -1853,18 +1853,18 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
print "\n";
// Planned Workload
- print '
';
+ print ' | ';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
else print '--:--';
print ' | ';
// Progress declared %
- print '';
+ print ' | ';
print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
print ' | ';
// Time spent by everybody
- print '';
+ print ' | ';
// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
if ($lines[$i]->duration)
{
@@ -1876,7 +1876,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
print " | \n";
// Time spent by user
- print '';
+ print ' | ';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
else print '--:--';
@@ -1935,7 +1935,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
}
// Warning
- print ' | ';
+ print ' | ';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
elseif ($disabledtask)
{
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 398f4c67199..d121b39b683 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -386,7 +386,7 @@ $head=project_timesheet_prepare_head($mode, $usertoprocess);
dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
// Show description of content
-print '';
+print ' ';
if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').' ';
else
{
@@ -502,11 +502,11 @@ print ' '.$langs->trans("ProgressDeclared").
if ($usertoprocess->id == $user->id) print ' | '.$langs->trans("TimeSpentByYou").' | ';
else print ''.$langs->trans("TimeSpentByUser").' | ';*/
print ''.$langs->trans("TimeSpent").' ('.$langs->trans("Everybody").') | ';
-print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?' ('.$usertoprocess->firstname.')':'').' | ';
+print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ' ('.dol_trunc($usertoprocess->firstname, 10).')' : '').' | ';
foreach ($TWeek as $week_number)
{
- print ''.$langs->trans("Week").' '.$week_number.' ('.$langs->trans('From').' '.$TFirstDays[$week_number].' '.$langs->trans('to').' '.$TLastDays[$week_number].') | ';
+ print ''.$langs->trans("Week").' '.$week_number.' ('.$TFirstDays[$week_number].'...'.$TLastDays[$week_number].') | ';
}
print ' | ';
print "\n";
@@ -597,7 +597,7 @@ if (count($tasksarray) > 0)
print '
| ';
print $langs->trans("Total");
- print ' - '.$langs->trans("ExpectedWorkedHours").': '.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'';
+ print ' - '.$langs->trans("ExpectedWorkedHours").': '.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'';
print ' | ';
foreach ($TWeek as $weekNb)
|