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

develop

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

htdocs/accountancy/class/accountingaccount.class.php

@@ -81,12 +81,20 @@ class AccountingAccount extends CommonObject
 	var $account_category;
 
     /**
-         * @var string proper name for given parameter
+     * @var string Label of account
      */
     public $label;
 
-	var $fk_user_author;
+    /**
-	var $fk_user_modif;
+     * @var int ID
+     */
+    public $fk_user_author;
+
+    /**
+     * @var int ID
+     */
+    public $fk_user_modif;
+
     var $active;       // duplicate with status
 	var $status;
 

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

@@ -696,4 +696,3 @@ class Menubase
    }
 
 }
-

htdocs/loan/class/loanschedule.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;