diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1c453d49a8a..8a2ab3e0d42 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -609,22 +609,22 @@ class Form
}
/**
- * Show a text and picto with tooltip on text or picto.
+ * Show a text and picto with tooltip on text or picto.
* Can be called by an instancied $form->textwithtooltip or by a static call Form::textwithtooltip
*
- * @param string $text Text to show
- * @param string $htmltext HTML content of tooltip. Must be HTML/UTF8 encoded.
- * @param int $tooltipon 1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2
- * @param int $direction -1=image is before, 0=no image, 1=image is after
- * @param string $img Html code for image (use img_xxx() function to get it)
- * @param string $extracss Add a CSS style to td tags
- * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
- * @param string $incbefore Include code before the text
- * @param int $noencodehtmltext Do not encode into html entity the htmltext
- * @param string $tooltiptrigger ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
- * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
- * @return string Code html du tooltip (texte+picto)
- * @see textwithpicto() Use thisfunction if you can.
+ * @param string $text Text to show
+ * @param string $htmltext HTML content of tooltip. Must be HTML/UTF8 encoded.
+ * @param int $tooltipon 1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2
+ * @param int $direction -1=image is before, 0=no image, 1=image is after
+ * @param string $img Html code for image (use img_xxx() function to get it)
+ * @param string $extracss Add a CSS style to td tags
+ * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+ * @param string $incbefore Include code before the text
+ * @param int $noencodehtmltext Do not encode into html entity the htmltext
+ * @param string $tooltiptrigger ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+ * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
+ * @return string Code html du tooltip (texte+picto)
+ * @see textwithpicto() Use thisfunction if you can.
*/
public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
{
@@ -725,16 +725,16 @@ class Form
/**
* Show a text with a picto and a tooltip on picto
*
- * @param string $text Text to show
- * @param string $htmltext Content of tooltip
- * @param int $direction 1=Icon is after text, -1=Icon is before text, 0=no icon
- * @param string $type Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'
- * @param string $extracss Add a CSS style to td, div or span tag
- * @param int $noencodehtmltext Do not encode into html entity the htmltext
- * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
- * @param string $tooltiptrigger ''=Tooltip on hover and hidden on smartphone, 'abconsmartphone'=Tooltip on hover and on click on smartphone, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')
- * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
- * @return string HTML code of text, picto, tooltip
+ * @param string $text Text to show
+ * @param string $htmltext Content of tooltip
+ * @param int $direction 1=Icon is after text, -1=Icon is before text, 0=no icon
+ * @param string $type Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'
+ * @param string $extracss Add a CSS style to td, div or span tag
+ * @param int $noencodehtmltext Do not encode into html entity the htmltext
+ * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+ * @param string $tooltiptrigger ''=Tooltip on hover and hidden on smartphone, 'abconsmartphone'=Tooltip on hover and on click on smartphone, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')
+ * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
+ * @return string HTML code of text, picto, tooltip
*/
public function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 3, $tooltiptrigger = '', $forcenowrap = 0)
{
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 3e800760606..d8a25d06842 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1003,27 +1003,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
print ''."\n";
print ''."\n";
- if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
- print dol_get_fiche_head('', '', '', -1);
-
- $out = '';
- $nb_holiday = 0;
- $typeleaves = $object->getTypes(1, 1);
- foreach ($typeleaves as $key => $val) {
- $nb_type = $object->getCPforUser($user->id, $val['rowid']);
- $nb_holiday += $nb_type;
-
- $out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': '.($nb_type ? price2num($nb_type) : 0).' ';
- //$out .= ' - '.$val['label'].': '.($nb_type ?price2num($nb_type) : 0).' ';
- }
- print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).' ';
- print $out;
-
- print dol_get_fiche_end();
- } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) {
- print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).' ';
- }
-
print dol_get_fiche_head();
//print ''.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'
';
@@ -1033,14 +1012,57 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
// User for leave request
print '