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

htdocs/compta/bank/class/account.class.php

@@ -1774,11 +1774,13 @@ class AccountLine extends CommonObject
      */
 	public $fk_account;
 
-	public $bank_account_label; // Label of bank account
+	/**
+	 * @var string		Label of bank account
+	 */
+	public $bank_account_label;
 
     /**
-	 * Issuer
+	 * @var string		Name of check issuer
-	 * @var Societe
 	 */
 	public $emetteur;
 

htdocs/core/class/html.formaccounting.class.php

@@ -432,11 +432,11 @@ class FormAccounting extends Form
 	/**
 	 * Return HTML combo list of years existing into book keepping
 	 *
-	 * @param string $selected Preselected value
+	 * @param string 	$selected 		Preselected value
-	 * @param string $htmlname Name of HTML select object
+	 * @param string 	$htmlname 		Name of HTML select object
-	 * @param int $useempty Affiche valeur vide dans liste
+	 * @param int 		$useempty 		Affiche valeur vide dans liste
-	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
+	 * @param string 	$output_format 	(html/opton (for option html only)/array (to return options arrays
-	 * @return string/array
+	 * @return string|array				HTML select component or array of select options
 	 */
 	public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
 	{

htdocs/debugbar/class/TraceableDB.php

@@ -26,7 +26,7 @@ class TraceableDB extends DoliDB
 	 */
 	protected $startMemory;
 	/**
-	 * @var Database type
+	 * @var string type
 	 */
 	public $type;
 	/**

htdocs/opensurvey/class/opensurveysondage.class.php

@@ -83,14 +83,12 @@ class Opensurveysondage extends CommonObject
     public $sujet;
 
     /**
-     * Allow comments on this poll
+     * @var int		Allow comments on this poll
-     * @var bool
      */
     public $allow_comments;
 
     /**
-     * Allow users see others vote
+     * @var int		Allow users see others vote
-     * @var bool
      */
     public $allow_spy;
 

htdocs/product/stock/class/mouvementstock.class.php

@@ -80,9 +80,14 @@ class MouvementStock extends CommonObject
 	public $fk_origin;
 
 	public $origintype;
+
 	public $inventorycode;
 	public $batch;
 
+	/**
+	 * @var Object		Object set as origin before calling livraison() or reception()
+	 */
+	public $origin;
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
@@ -385,6 +390,7 @@ class MouvementStock extends CommonObject
 
 		if ($movestock && $entrepot_id > 0)	// Change stock for current product, change for subproduct is done after
 		{
+			// Set $origintype, fk_origin, fk_project
 			$fk_project = 0;
 			if (!empty($this->origin)) {			// This is set by caller for tracking reason
 				$origintype = empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type;

htdocs/ticket/class/ticket.class.php

@@ -2440,7 +2440,7 @@ class Ticket extends CommonObject
 			$id = $object->createTicketMessage($user, 0, $listofpaths, $listofmimes, $listofnames);
 			if ($id <= 0) {
 				$error++;
-				$this->errors = $object->error;
+				$this->error = $object->error;
 				$this->errors = $object->errors;
 				$action = 'add_message';
 			}

htdocs/user/class/usergroup.class.php

@@ -606,7 +606,7 @@ class UserGroup extends CommonObject
 	 *	Delete a group
 	 *
 	 *	@param	User	$user		User that delete
-	 *	@return     				<0 if KO, > 0 if OK
+	 *	@return int    				<0 if KO, > 0 if OK
 	 */
 	public function delete(User $user)
 	{