Merge branch 'develop' into NEW_pdf_supplier_payment

This commit is contained in:
Laurent Destailleur
2017-02-22 14:20:47 +01:00
committed by GitHub
1504 changed files with 15060 additions and 8404 deletions

View File

@@ -2566,7 +2566,7 @@ function img_printer($titlealt = "default", $other='')
/**
* Show help logo with cursor "?"
*
* @param int $usehelpcursor Use help cursor
* @param int $usehelpcursor 1=Use help cursor, 2=Use click pointer cursor, 0=No specific cursor
* @param int|string $usealttitle Text to use as alt title
* @return string Return tag img
*/
@@ -2580,7 +2580,7 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
else $usealttitle = $langs->trans('Info');
}
return img_picto($usealttitle, 'info.png', ($usehelpcursor ? 'style="vertical-align: middle; cursor: help"' : 'style="vertical-align: middle;"'));
return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help': ($usehelpcursor == 2 ? ' cursor: pointer':'')).'"');
}
/**