diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index b5646e37128..ddfa1733f8c 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -917,9 +917,9 @@ elseif ($object->id > 0) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - $start = dol_print_date($object->date_start,'dayhour'); + $start = dol_print_date($object->date_start,'day'); print ($start?$start:'?'); - $end = dol_print_date($object->date_end,'dayhour'); + $end = dol_print_date($object->date_end,'day'); print ' - '; print ($end?$end:'?'); if ($object->hasDelay()) print img_warning("Late"); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 72b82ac2bb0..fde0ed45288 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -150,26 +150,26 @@ if ($id > 0 || ! empty($ref)) // Project card - + $linkback = ''.$langs->trans("BackToList").''; - + $morehtmlref='
'; // Title $morehtmlref.=$object->title; // Thirdparty - if ($object->thirdparty->id > 0) + if ($object->thirdparty->id > 0) { $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project'); } $morehtmlref.='
'; - + // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) { $objectsListId = $object->getProjectsAuthorizedForUser($user,0,0); $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")"; } - + dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); @@ -178,7 +178,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print ''; - + // Visibility print ''; - + // Opportunity percent print ''; } - + // Date start - end print '
'.$langs->trans("Visibility").''; if ($object->public) print $langs->trans('SharedProject'); @@ -192,7 +192,7 @@ if ($id > 0 || ! empty($ref)) $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code'); if ($code) print $langs->trans("OppStatus".$code); print '
'.$langs->trans("OpportunityProbability").''; if (strcmp($object->opp_percent,'')) print price($object->opp_percent,'',$langs,1,0).' %'; @@ -203,12 +203,12 @@ if ($id > 0 || ! empty($ref)) if (strcmp($object->opp_amount,'')) print price($object->opp_amount,'',$langs,0,0,0,$conf->currency); print '
'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - $start = dol_print_date($object->date_start,'dayhour'); + $start = dol_print_date($object->date_start,'day'); print ($start?$start:'?'); - $end = dol_print_date($object->date_end,'dayhour'); + $end = dol_print_date($object->date_end,'day'); print ' - '; print ($end?$end:'?'); if ($object->hasDelay()) print img_warning("Late"); @@ -222,40 +222,40 @@ if ($id > 0 || ! empty($ref)) // Other attributes $cols = 2; include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; - + print "
"; print ''; print '
'; print '
'; print '
'; - + print ''; - + // Description print ''; - + // Categories if ($conf->categorie->enabled) { print '"; } - + print '
'.$langs->trans("Description").''; print nl2br($object->description); print '
'.$langs->trans("Categories").''; print $form->showCategories($object->id,'project',1); print "
'; - + print '
'; print '
'; print ''; - + print '
'; - + dol_fiche_end(); - + print '
'; - + // Contacts lines (modules that overwrite templates must declare this into descriptor) $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index d4829d8e839..2b753a50468 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -185,9 +185,9 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; -$start = dol_print_date($object->date_start,'dayhour'); +$start = dol_print_date($object->date_start,'day'); print ($start?$start:'?'); -$end = dol_print_date($object->date_end,'dayhour'); +$end = dol_print_date($object->date_end,'day'); print ' - '; print ($end?$end:'?'); if ($object->hasDelay()) print img_warning("Late"); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index dd9d03b25b1..0c1e86c8ab5 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -140,9 +140,9 @@ if (($id > 0 && is_numeric($id)) || ! empty($ref)) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - $start = dol_print_date($object->date_start,'dayhour'); + $start = dol_print_date($object->date_start,'day'); print ($start?$start:'?'); - $end = dol_print_date($object->date_end,'dayhour'); + $end = dol_print_date($object->date_end,'day'); print ' - '; print ($end?$end:'?'); if ($object->hasDelay()) print img_warning("Late"); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 4d43b6e4bc2..47de9ce2b19 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -281,9 +281,9 @@ if ($id > 0 || ! empty($ref)) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - $start = dol_print_date($object->date_start,'dayhour'); + $start = dol_print_date($object->date_start,'day'); print ($start?$start:'?'); - $end = dol_print_date($object->date_end,'dayhour'); + $end = dol_print_date($object->date_end,'day'); print ' - '; print ($end?$end:'?'); if ($object->hasDelay()) print img_warning("Late"); diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index e4250bad062..49072299ac4 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -152,9 +152,12 @@ if ($id > 0 || ! empty($ref)) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - print dol_print_date($projectstatic->date_start,'day'); - $end=dol_print_date($projectstatic->date_end,'day'); - if ($end) print ' - '.$end; + $start = dol_print_date($projectstatic->date_start,'day'); + print ($start?$start:'?'); + $end = dol_print_date($projectstatic->date_end,'day'); + print ' - '; + print ($end?$end:'?'); + if ($projectstatic->hasDelay()) print img_warning("Late"); print ''; // Budget @@ -263,7 +266,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); - + // Include comment tpl view include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_comment.tpl.php'; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index d3baba4d5fb..a2bb784c062 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -228,9 +228,12 @@ if ($id > 0 || ! empty($ref)) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - print dol_print_date($projectstatic->date_start,'day'); - $end=dol_print_date($projectstatic->date_end,'day'); - if ($end) print ' - '.$end; + $start = dol_print_date($projectstatic->date_start,'day'); + print ($start?$start:'?'); + $end = dol_print_date($projectstatic->date_end,'day'); + print ' - '; + print ($end?$end:'?'); + if ($projectstatic->hasDelay()) print img_warning("Late"); print ''; // Budget diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index f6f206f90ec..7fc0b981902 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -172,9 +172,12 @@ if ($object->id > 0) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - print dol_print_date($projectstatic->date_start,'day'); - $end=dol_print_date($projectstatic->date_end,'day'); - if ($end) print ' - '.$end; + $start = dol_print_date($projectstatic->date_start,'day'); + print ($start?$start:'?'); + $end = dol_print_date($projectstatic->date_end,'day'); + print ' - '; + print ($end?$end:'?'); + if ($projectstatic->hasDelay()) print img_warning("Late"); print ''; // Budget diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 87d949eb645..da33b8b7607 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -150,9 +150,12 @@ if ($object->id > 0) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - print dol_print_date($projectstatic->date_start,'day'); - $end=dol_print_date($projectstatic->date_end,'day'); - if ($end) print ' - '.$end; + $start = dol_print_date($projectstatic->date_start,'day'); + print ($start?$start:'?'); + $end = dol_print_date($projectstatic->date_end,'day'); + print ' - '; + print ($end?$end:'?'); + if ($projectstatic->hasDelay()) print img_warning("Late"); print ''; // Budget diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 71d487da2d6..479366ab586 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -262,9 +262,12 @@ if ($id > 0 || ! empty($ref)) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - print dol_print_date($projectstatic->date_start,'day'); - $end=dol_print_date($projectstatic->date_end,'day'); - if ($end) print ' - '.$end; + $start = dol_print_date($projectstatic->date_start,'day'); + print ($start?$start:'?'); + $end = dol_print_date($projectstatic->date_end,'day'); + print ' - '; + print ($end?$end:'?'); + if ($projectstatic->hasDelay()) print img_warning("Late"); print ''; // Budget diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 45018d79742..ce2e1c32889 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -349,9 +349,12 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Date start - end print ''.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").''; - print dol_print_date($projectstatic->date_start,'day'); - $end=dol_print_date($projectstatic->date_end,'day'); - if ($end) print ' - '.$end; + $start = dol_print_date($projectstatic->date_start,'day'); + print ($start?$start:'?'); + $end = dol_print_date($projectstatic->date_end,'day'); + print ' - '; + print ($end?$end:'?'); + if ($projectstatic->hasDelay()) print img_warning("Late"); print ''; // Budget