diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dc47dec5c41..1366435f144 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4740,7 +4740,7 @@ class Form
// Year
if ($emptydate || $set_time == -1)
{
- $retstring.='';
+ $retstring.='';
}
else
{
@@ -4885,7 +4885,7 @@ class Form
* @param string $prefix Prefix for input fields
* @param int $iSecond Default preselected duration (number of seconds or '')
* @param int $disabled Disable the combo box
- * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo
+ * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text
* @param integer $minunderhours If 1, show minutes selection under the hours
* @param int $nooutput Do not output html string but return it
* @return string|null
@@ -4923,12 +4923,13 @@ class Form
}
elseif ($typehour=='text')
{
- $retstring.='';
+ $retstring.='';
}
else return 'BadValueForParameterTypeHour';
- $retstring.=' '.$langs->trans('HourShort');
-
+ if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
+ else $retstring.=':';
+
// Minutes
if ($minunderhours) $retstring.=' ';
else $retstring.=" ";
@@ -4946,10 +4947,12 @@ class Form
}
elseif ($typehour=='text')
{
- $retstring.='';
+ $retstring.='';
}
- $retstring.=' '.$langs->trans('MinuteShort');
- $retstring.=" ";
+
+ if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort');
+
+ //$retstring.=" ";
if (! empty($nooutput)) return $retstring;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 0a6837ecb53..ea77904f5cf 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -352,7 +352,7 @@ class FormProjets
}
if (empty($option_only)) {
- $out.= '