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

Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-16 15:38:24 +01:00
parent f809800e01
commit 060b59ac6c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/tpl/objectline_view.tpl.php
View File

@ -90,12 +90,14 @@ if (empty($usemargins)) $usemargins=0;
} }
else else
{ {
$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
if ($line->fk_product > 0) if ($line->fk_product > 0)
{ {
echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):'')); echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
// Show range // 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 // Add description in form
if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
@ -119,7 +121,7 @@ if (empty($usemargins)) $usemargins=0;
} }
// Show range // Show range
echo get_date_range($line->date_start,$line->date_end); echo get_date_range($line->date_start,$line->date_end, $format);
} }
} }
?> ?>