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

Fix date start/end of project are day not hours

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-15 02:02:32 +01:00
parent 18acff5e57
commit a4384b1921
11 changed files with 65 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/card.php
View File

@ -917,9 +917,9 @@ elseif ($object->id > 0)
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
$start = dol_print_date($object->date_start,'dayhour'); $start = dol_print_date($object->date_start,'day');
print ($start?$start:'?'); print ($start?$start:'?');
$end = dol_print_date($object->date_end,'dayhour'); $end = dol_print_date($object->date_end,'day');
print ' - '; print ' - ';
print ($end?$end:'?'); print ($end?$end:'?');
if ($object->hasDelay()) print img_warning("Late"); if ($object->hasDelay()) print img_warning("Late");

4
htdocs/projet/contact.php
View File

@ -206,9 +206,9 @@ if ($id > 0 || ! empty($ref))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
$start = dol_print_date($object->date_start,'dayhour'); $start = dol_print_date($object->date_start,'day');
print ($start?$start:'?'); print ($start?$start:'?');
$end = dol_print_date($object->date_end,'dayhour'); $end = dol_print_date($object->date_end,'day');
print ' - '; print ' - ';
print ($end?$end:'?'); print ($end?$end:'?');
if ($object->hasDelay()) print img_warning("Late"); if ($object->hasDelay()) print img_warning("Late");

4
htdocs/projet/element.php
View File

@ -185,9 +185,9 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
$start = dol_print_date($object->date_start,'dayhour'); $start = dol_print_date($object->date_start,'day');
print ($start?$start:'?'); print ($start?$start:'?');
$end = dol_print_date($object->date_end,'dayhour'); $end = dol_print_date($object->date_end,'day');
print ' - '; print ' - ';
print ($end?$end:'?'); print ($end?$end:'?');
if ($object->hasDelay()) print img_warning("Late"); if ($object->hasDelay()) print img_warning("Late");

4
htdocs/projet/ganttview.php
View File

@ -140,9 +140,9 @@ if (($id > 0 && is_numeric($id)) || ! empty($ref))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
$start = dol_print_date($object->date_start,'dayhour'); $start = dol_print_date($object->date_start,'day');
print ($start?$start:'?'); print ($start?$start:'?');
$end = dol_print_date($object->date_end,'dayhour'); $end = dol_print_date($object->date_end,'day');
print ' - '; print ' - ';
print ($end?$end:'?'); print ($end?$end:'?');
if ($object->hasDelay()) print img_warning("Late"); if ($object->hasDelay()) print img_warning("Late");

4
htdocs/projet/tasks.php
View File

@ -281,9 +281,9 @@ if ($id > 0 || ! empty($ref))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
$start = dol_print_date($object->date_start,'dayhour'); $start = dol_print_date($object->date_start,'day');
print ($start?$start:'?'); print ($start?$start:'?');
$end = dol_print_date($object->date_end,'dayhour'); $end = dol_print_date($object->date_end,'day');
print ' - '; print ' - ';
print ($end?$end:'?'); print ($end?$end:'?');
if ($object->hasDelay()) print img_warning("Late"); if ($object->hasDelay()) print img_warning("Late");

9
htdocs/projet/tasks/comment.php
View File

@ -152,9 +152,12 @@ if ($id > 0 || ! empty($ref))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_start,'day'); $start = dol_print_date($projectstatic->date_start,'day');
$end=dol_print_date($projectstatic->date_end,'day'); print ($start?$start:'?');
if ($end) print ' - '.$end; $end = dol_print_date($projectstatic->date_end,'day');
print ' - ';
print ($end?$end:'?');
if ($projectstatic->hasDelay()) print img_warning("Late");
print '</td></tr>'; print '</td></tr>';
// Budget // Budget

9
htdocs/projet/tasks/contact.php
View File

@ -228,9 +228,12 @@ if ($id > 0 || ! empty($ref))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_start,'day'); $start = dol_print_date($projectstatic->date_start,'day');
$end=dol_print_date($projectstatic->date_end,'day'); print ($start?$start:'?');
if ($end) print ' - '.$end; $end = dol_print_date($projectstatic->date_end,'day');
print ' - ';
print ($end?$end:'?');
if ($projectstatic->hasDelay()) print img_warning("Late");
print '</td></tr>'; print '</td></tr>';
// Budget // Budget

9
htdocs/projet/tasks/document.php
View File

@ -172,9 +172,12 @@ if ($object->id > 0)
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_start,'day'); $start = dol_print_date($projectstatic->date_start,'day');
$end=dol_print_date($projectstatic->date_end,'day'); print ($start?$start:'?');
if ($end) print ' - '.$end; $end = dol_print_date($projectstatic->date_end,'day');
print ' - ';
print ($end?$end:'?');
if ($projectstatic->hasDelay()) print img_warning("Late");
print '</td></tr>'; print '</td></tr>';
// Budget // Budget

9
htdocs/projet/tasks/note.php
View File

@ -150,9 +150,12 @@ if ($object->id > 0)
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_start,'day'); $start = dol_print_date($projectstatic->date_start,'day');
$end=dol_print_date($projectstatic->date_end,'day'); print ($start?$start:'?');
if ($end) print ' - '.$end; $end = dol_print_date($projectstatic->date_end,'day');
print ' - ';
print ($end?$end:'?');
if ($projectstatic->hasDelay()) print img_warning("Late");
print '</td></tr>'; print '</td></tr>';
// Budget // Budget

9
htdocs/projet/tasks/task.php
View File

@ -262,9 +262,12 @@ if ($id > 0 || ! empty($ref))
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_start,'day'); $start = dol_print_date($projectstatic->date_start,'day');
$end=dol_print_date($projectstatic->date_end,'day'); print ($start?$start:'?');
if ($end) print ' - '.$end; $end = dol_print_date($projectstatic->date_end,'day');
print ' - ';
print ($end?$end:'?');
if ($projectstatic->hasDelay()) print img_warning("Late");
print '</td></tr>'; print '</td></tr>';
// Budget // Budget

9
htdocs/projet/tasks/time.php
View File

@ -349,9 +349,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Date start - end // Date start - end
print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_start,'day'); $start = dol_print_date($projectstatic->date_start,'day');
$end=dol_print_date($projectstatic->date_end,'day'); print ($start?$start:'?');
if ($end) print ' - '.$end; $end = dol_print_date($projectstatic->date_end,'day');
print ' - ';
print ($end?$end:'?');
if ($projectstatic->hasDelay()) print img_warning("Late");
print '</td></tr>'; print '</td></tr>';
// Budget // Budget