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

htdocs/accountancy/class/accountancycategory.class.php

@@ -297,7 +297,7 @@ class AccountancyCategory
 	 * @param string $year Specific year
 	 * @param int $sens Sens of the account 0: credit - debit 1: debit - credit
 	 *
-	 * @return array Result in table
+	 * @return integer Result in table
 	 */
 	public function getResult($cpt, $month, $year, $sens) {
 		$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";

htdocs/core/boxes/box_actions.php

@@ -168,7 +168,7 @@ class box_actions extends ModeleBoxes
 	 *	@param	array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
+	 *	@return	string
 	 */
     function showBox($head = null, $contents = null, $nooutput=0)
     {