Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into new_branch_30_08_2018

htdocs/accountancy/class/accountancycategory.class.php

@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
  */
 class AccountancyCategory 	// extends CommonObject
 {
-    /**
+    	/**
-     * @var DoliDB Database handler.
+     	 * @var DoliDB Database handler.
-     */
+     	 */
-    public $db;
+    	public $db;
 
 	/**
 	 * @var string 		Error string
@@ -57,21 +57,21 @@ class AccountancyCategory 	// extends CommonObject
 	public $table_element='c_accounting_category';
 
 	/**
-     * @var int ID
+     	 * @var int ID
-     */
+     	 */
-    public $id;
+    	public $id;
 
 	/**
 	 * @var mixed Sample property 1
 	 */
 	public $code;
 
-	/**
+       /**
-     * @var string proper name for given parameter
+     	* @var string proper name for given parameter
-     */
+     	*/
-    public $label;
+    	public $label;
 
-    /**
+    	/**
 	 * @var mixed Sample property 1
 	 */
 	public $range_account;

htdocs/accountancy/class/accountingaccount.class.php

@@ -79,35 +79,24 @@ class AccountingAccount extends CommonObject
 	var $account_number;
 	var $account_parent;
 	var $account_category;
-<<<<<<< HEAD
+
-	
+    	/**
-	/**
+     	 * @var string Label of account
-     	 * @var string proper name for given parameter
      	 */
     	public $label;
-    
-	var $fk_user_author;
-	var $fk_user_modif;
-	var $active;       // duplicate with status
-=======
 
-    /**
+    	/**
-     * @var string Label of account
+    	 * @var int ID
-     */
+     	 */
-    public $label;
+    	public $fk_user_author;
 
-    /**
+    	/**
-     * @var int ID
+     	 * @var int ID
-     */
+     	 */
-    public $fk_user_author;
+    	public $fk_user_modif;
 
-    /**
+    	var $active;       // duplicate with status
-     * @var int ID
+	
-     */
-    public $fk_user_modif;
-
-    var $active;       // duplicate with status
->>>>>>> upstream/develop
 	var $status;