diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index d3adfa4d234..cc4600d33ef 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -630,6 +630,7 @@ if ($_GET["id"]) // Date planification print ''.$langs->trans("DateActionPlanned").''; $html->select_date(($act->datep?$act->datep:-1),'ap',1,1,1,"action"); + if ($act->datep < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) print img_warning($langs->trans("Late")); print ''; // Date done @@ -709,8 +710,11 @@ if ($_GET["id"]) print $langs->trans("FeatureNotYetSupported"); print ''; - // Date debut - print ''.$langs->trans("DateActionPlanned").''.dolibarr_print_date($act->datep,'%d %B %Y %H:%M').''; + // Date planification + print ''.$langs->trans("DateActionPlanned").''; + print dolibarr_print_date($act->datep,'%d %B %Y %H:%M'); + if ($act->datep < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) print img_warning($langs->trans("Late")); + print ''; // Date fin real print ''.$langs->trans("DateActionDone").''.dolibarr_print_date($act->date,'%d %B %Y %H:%M').''; diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php index de410e6d97f..08d3790f6bd 100644 --- a/htdocs/includes/boxes/box_actions.php +++ b/htdocs/includes/boxes/box_actions.php @@ -98,6 +98,7 @@ class box_actions extends ModeleBoxes { $this->info_box_contents[$i][0] = array('align' => 'left', + 'nowrap' => 1, 'logo' => ("task"), 'text' => $objp->label, 'text2'=> $late, diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php index 852b1bf18cc..ae12ca9b75c 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/includes/boxes/modules_boxes.php @@ -98,6 +98,7 @@ class ModeleBoxes { $tdparam=""; if (isset($contents[$i][$j]['align'])) $tdparam.=' align="'. $contents[$i][$j]['align'].'"'; + if (isset($contents[$i][$j]['nowrap'])) $tdparam.=' nowrap="'. $contents[$i][$j]['align'].'"'; if (isset($contents[$i][$j]['width'])) $tdparam.=' width="'. $contents[$i][$j]['width'].'"'; if (isset($contents[$i][$j]['colspan'])) $tdparam.=' colspan="'. $contents[$i][$j]['colspan'].'"'; if (isset($contents[$i][$j]['class'])) $tdparam.=' class="'. $contents[$i][$j]['class'].'"';