Fix phpcs

Dolibarr · May 7, 2015 · afc487e · afc487e
1 parent f993920
commit afc487e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -3229,13 +3229,13 @@ function __clone()
 	/**
 	 * Common function for all objects extending CommonObject for generating documents
 	 *
-	 * @param string $modelspath Relative folder where models are placed
-	 * @param string $modele Model to use
-	 * @param Translate $outputlangs Language to use
-	 * @param int $hidedetails 1 to hide details. 0 by default
-	 * @param int $hidedesc 1 to hide product description. 0 by default
-	 * @param int $hideref 1 to hide product reference. 0 by default
-	 * @return int 1 if OK -1 if not OK
+	 * @param 	string 		$modelspath Relative folder where models are placed
+	 * @param 	string 		$modele Model to use
+	 * @param 	Translate 	$outputlangs Language to use
+	 * @param 	int 		$hidedetails 1 to hide details. 0 by default
+	 * @param 	int 		$hidedesc 1 to hide product description. 0 by default
+	 * @param 	int 		$hideref 1 to hide product reference. 0 by default
+	 * @return 	int 		1 if OK -1 if KO
 	 */
 	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref)
 	{

diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
@@ -143,14 +143,17 @@ function getVersion()
 }
 
 /**
- * 	Cree un bon d'expedition sur disque
+ * 	Create a document onto disk according to template module.
  *
- * 	@param	DoliDB		$db  			Objet base de donnee
- * 	@param	Object		$object			Object expedition
- * 	@param	string		$modele			Force le modele a utiliser ('' to not force)
- * 	@param	Translate	$outputlangs	Objet lang a utiliser pour traduction
- *  @return int             			<=0 if KO, >0 if OK
- * @deprecated Use the new function generateDocument of Expedition class
+ * 	@param		DoliDB		$db  			Objet base de donnee
+ * 	@param		Object		$object			Object expedition
+ * 	@param		string		$modele			Force le modele a utiliser ('' to not force)
+ * 	@param		Translate	$outputlangs	Objet lang a utiliser pour traduction
+ *  @param      int			$hidedetails    Hide details of lines
+ *  @param      int			$hidedesc       Hide description
+ *  @param      int			$hideref        Hide ref
+ * 	@return 	int 						1 if OK -1 if KO
+ * 	@deprecated Use the new function generateDocument of Expedition class
  */
 function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -1598,14 +1598,14 @@ function set_billed()
 	}
 
 	/**
-	 *  Create a document onto disk accordign to template module.
+	 *  Create a document onto disk according to template module.
 	 *
 	 *  @param	    string		$modele			Force the model to using ('' to not force)
 	 *  @param		Translate	$outputlangs	object lang to use for translations
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-	 *  @return     int         				0 if KO, 1 if OK
+	 * 	@return 	int 						1 if OK -1 if KO
 	 */
 	public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0)
 	{