Skip to content
Snippets Groups Projects
Commit 14fb2c91 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output

parent d8e173af
No related branches found
No related tags found
No related merge requests found
......@@ -90,12 +90,14 @@ if (empty($usemargins)) $usemargins=0;
}
else
{
if ($line->fk_product > 0)
$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
if ($line->fk_product > 0)
{
echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
// Show range
echo get_date_range($line->date_start, $line->date_end);
echo get_date_range($line->date_start, $line->date_end, $format);
// Add description in form
if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
......@@ -119,7 +121,7 @@ if (empty($usemargins)) $usemargins=0;
}
// Show range
echo get_date_range($line->date_start,$line->date_end);
echo get_date_range($line->date_start,$line->date_end, $format);
}
}
?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment