Merge remote branch 'upstream/develop' into php-iban

htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

@@ -444,7 +444,7 @@ class pdf_ extends ModeleExpenseReport
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			&$pdf     		Object PDF
+	 *  @param	PDF			$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -660,11 +660,11 @@ class pdf_ extends ModeleExpenseReport
 	/**
 	 *   Affiche la grille des lignes de factures
 	 *
-	 *   @param     $pdf     		Objet PDF
-	 *   @param		$tab_top		Tab top
-	 *   @param		$tab_height		Tab height
-	 *   @param		$nexY			next y
-	 *   @param		$outputlangs	Output langs
+	 *   @param     PDF			$pdf     		Object PDF
+	 *   @param		int			$tab_top		Tab top
+	 *   @param		int			$tab_height		Tab height
+	 *   @param		int			$nexY			next y
+	 *   @param		Translate	$outputlangs	Output langs
 	 *   @return	void
 	 */
 	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)

htdocs/expensereport/class/expensereport.class.php

@@ -561,7 +561,7 @@ class ExpenseReport extends CommonObject
 	/**
 	 * recalculer
 	 *
-	 * @param 	int			$id
+	 * @param 	int			$id		Id of expense report
 	 * @return 	int					<0 if KO, >0 if OK
 	 */
 	function recalculer($id)