Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

2016-06-23 20:20:16 +02:00
parent 2223ec15d1 96ece1afa0
commit 91e13d23fe
11 changed files with 59 additions and 138 deletions
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1239,7 +1239,7 @@ function hexbin($hexa)
 *	Retourne le numero de la semaine par rapport a une date
 *
 *	@param	string	$time   	Date au format 'timestamp'
- *	@return int					Number of week
+ *	@return string					Number of week
 */
 function numero_semaine($time)
 {