Merge remote-tracking branch 'upstream/develop' into trimtrailing2

htdocs/accountancy/class/accountingaccount.class.php

@@ -81,7 +81,7 @@ class AccountingAccount extends CommonObject
 	var $account_category;
 
     /**
-     * @var string proper name for given parameter
+     * @var string Label of account
      */
     public $label;
 

htdocs/comm/mailing/class/html.formadvtargetemailing.class.php

@@ -30,7 +30,7 @@ class FormAdvTargetEmailing extends Form
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	/**
 	 * @var string Error code (or message)
 	 */
@@ -378,10 +378,10 @@ class FormAdvTargetEmailing extends Form
 	/**
 	 *  Return combo list of categories
 	 *
-	 *  @param  string	$htmlname   Name of categorie
-	 * 	@param	array	$selected_array	value selected
-	 * 	@param	int	$type	type
-	 *  @return	string HTML combo
+	 *  @param  string	$htmlname  		Name of categorie
+	 * 	@param	array	$selected_array	Value selected
+	 * 	@param	int		$type			Type
+	 *  @return	string 					HTML combo
 	 */
 	public function multiselectCategories($htmlname='',$selected_array = array(), $type=0)
 	{

htdocs/core/class/menubase.class.php

@@ -39,9 +39,9 @@ class Menubase
     public $error;
 
     /**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     public $id;
 

htdocs/expensereport/class/expensereport.class.php

@@ -37,12 +37,12 @@ class ExpenseReport extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='expensereport';
-	
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='expensereport';
-	
+
     var $table_element_line = 'expensereport_det';
     var $fk_element = 'fk_expensereport';
     var $picto = 'trip';
@@ -2390,7 +2390,7 @@ class ExpenseReportLine
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
     /**
 	 * @var string Error code (or message)
 	 */

htdocs/fourn/class/fournisseur.commande.class.php

@@ -44,22 +44,22 @@ class CommandeFournisseur extends CommonOrder
 	 * @var string ID to identify managed object
 	 */
 	public $element='order_supplier';
-    
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='commande_fournisseur';
-	
+
     public $table_element_line = 'commande_fournisseurdet';
     public $fk_element = 'fk_commande';
     public $picto='order';
-    
+
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
      * @var int
      */
     public $ismultientitymanaged = 1;
-    
+
     /**
      * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
      * @var integer
@@ -78,7 +78,7 @@ class CommandeFournisseur extends CommonOrder
 	 * @var string
 	 */
     public $ref;
-    
+
     public $ref_supplier;
     public $brouillon;
     public $statut;			// 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
@@ -3099,7 +3099,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 * @var string ID to identify managed object
 	 */
 	public $element='commande_fournisseurdet';
-    
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */

htdocs/loan/class/loan.class.php

@@ -33,9 +33,9 @@ class Loan extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='loan';
-	
+
 	public $table='loan';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */

htdocs/projet/class/task.class.php

@@ -45,10 +45,10 @@ class Task extends CommonObject
 	public $picto = 'task';
 	protected $childtables=array('projet_task_time');    // To test if we can delete object
 
-	var $fk_task_parent;
+    public $fk_task_parent;
 
     /**
-     * @var string proper name for given parameter
+     * @var string Label of task
      */
     public $label;
 

htdocs/resource/class/dolresource.class.php

@@ -19,7 +19,6 @@
  *  \file      	resource/class/resource.class.php
  *  \ingroup    resource
  *  \brief      Class file for resource object
-
  */
 
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";