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

develop

Conflicts:
	htdocs/ticket/class/ticket.class.php

htdocs/accountancy/class/accountancycategory.class.php

@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
  */
 class AccountancyCategory 	// extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;

htdocs/accountancy/class/accountingaccount.class.php

@@ -80,14 +80,22 @@ class AccountingAccount extends CommonObject
 	var $account_parent;
 	var $account_category;
 
-	/**
+    /**
-         * @var string proper name for given parameter
+     * @var string Label of account
-         */
+     */
-        public $label;
+    public $label;
 
-	var $fk_user_author;
+    /**
-	var $fk_user_modif;
+     * @var int ID
-	var $active;       // duplicate with status
+     */
+    public $fk_user_author;
+
+    /**
+     * @var int ID
+     */
+    public $fk_user_modif;
+
+    var $active;       // duplicate with status
 	var $status;
 
 
@@ -422,7 +430,7 @@ class AccountingAccount extends CommonObject
 	 * @param	string  $moretitle					Add more text to title tooltip
 	 * @param	int  	$notooltip					1=Disable tooltip
      * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 * @return	string	String with URL
+	 * @return  string	String with URL
 	 */
 	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0, $save_lastsearch_value=-1)
 	{

htdocs/comm/mailing/class/advtargetemailing.class.php

@@ -28,30 +28,30 @@
  */
 class AdvanceTargetingMailing extends CommonObject
 {
-	/**
+    /**
-         * @var DoliDB Database handler.
+     * @var DoliDB Database handler.
-         */
+     */
-        public $db;
+    public $db;
-    
+
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';	
+	public $error='';
 
 	/**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
-	
+
 	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element='advtargetemailing';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='advtargetemailing';	
+	public $table_element='advtargetemailing';
 
 	/**
 	 * @var int ID

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -716,5 +716,3 @@ class PaymentSocialContribution extends CommonObject
 		return $result;
 	}
 }
-
-

htdocs/core/class/comment.class.php

@@ -1,4 +1,21 @@
 <?php
+/*
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
 /**
  * 	Class to manage comment
  */

htdocs/core/class/events.class.php

@@ -30,7 +30,7 @@
 
 
 /**
- *	Events class
+ *  Events class
  */
 class Events // extends CommonObject
 {
@@ -49,7 +49,7 @@ class Events // extends CommonObject
 	 */
 	public $id;
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;

htdocs/core/class/menubase.class.php

@@ -34,14 +34,14 @@ class Menubase
     public $db;
 
     /**
-	 * @var string Error code (or message)
+     * @var string Error code (or message)
-	 */
+     */
-	public $error;
+    public $error;
 
     /**
-	 * @var string[] Error codes (or messages)
+     * @var string[] Error codes (or messages)
-	 */
+     */
-	public $errors = array();
+    public $errors = array();
 
     public $id;
 
@@ -696,4 +696,3 @@ class Menubase
    }
 
 }
-

htdocs/don/class/paymentdonation.class.php

@@ -76,7 +76,7 @@ class PaymentDonation extends CommonObject
      *  Use this->amounts to have list of lines for the payment
      *
 	 *  @param      User		$user			User making payment
-	 *	@param      bool 		$notrigger 		false=launch triggers after, true=disable triggers
+	 *  @param      bool 		$notrigger 		false=launch triggers after, true=disable triggers
 	 *  @return     int     					<0 if KO, id of payment if OK
 	 */
 	function create($user, $notrigger=false)

htdocs/expedition/class/expeditionbatch.class.php

@@ -63,15 +63,15 @@ class ExpeditionLineBatch extends CommonObject
 	function fetchFromStock($id_stockdluo)
 	{
         $sql = "SELECT";
-	$sql.= " pb.batch,";
+        $sql.= " pb.batch,";
-	$sql.= " pl.sellby,";
+        $sql.= " pl.sellby,";
-	$sql.= " pl.eatby,";
+        $sql.= " pl.eatby,";
-	$sql.= " ps.fk_entrepot";
+        $sql.= " ps.fk_entrepot";
 
         $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
         $sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
-	$sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
+        $sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);

htdocs/expensereport/class/paymentexpensereport.class.php

@@ -34,12 +34,12 @@ class PaymentExpenseReport extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='payment_expensereport';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='payment_expensereport';	
+	public $table_element='payment_expensereport';
-	
+
     public $picto = 'payment';
 
 	var $rowid;

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

@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
  */
 class CommandeFournisseurDispatch extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;

htdocs/loan/class/loanschedule.class.php

@@ -17,8 +17,8 @@
 
 /**
  *      \file       htdocs/loan/class/loanschedule.class.php
- *		\ingroup    loan
+ *      \ingroup    loan
- *		\brief      File of class to manage schedule of loans
+ *      \brief      File of class to manage schedule of loans
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -547,4 +547,3 @@ class LoanSchedule extends CommonObject
 		return $result;
 	}
 }
-

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/ticket/class/ticketlogs.class.php

@@ -38,24 +38,24 @@ class Ticketlogs// extends CommonObject
     public $db;
 
     /**
-	 * @var string Error code (or message)
+     * @var string Error code (or message)
-	 */
+     */
-	public $error;
+    public $error;
 
     /**
-	 * @var string[] Error codes (or messages)
+     * @var string[] Error codes (or messages)
-	 */
+     */
-	public $errors = array();
+    public $errors = array();
 
     /**
-	 * @var string ID to identify managed object
+     * @var string ID to identify managed object
-	 */
+     */
-	public $element = 'ticketlogs';
+    public $element = 'ticketlogs';
 
     /**
-	 * @var string Name of table without prefix where object is stored
+     * @var string Name of table without prefix where object is stored
-	 */
+     */
-	public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored
+    public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored
 
     public $id;