Standardize and update code

htdocs/accountancy/class/accountancycategory.class.php

@@ -30,19 +30,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
  */
 class AccountancyCategory 	// extends CommonObject
 {
-<<<<<<< HEAD
-	/**
-     	 * @var DoliDB Database handler.
-     	 */
-    	public $db;
-    
-=======
     /**
      * @var DoliDB Database handler.
      */
     public $db;
 
->>>>>>> upstream/develop
 	/**
 	 * @var string 		Error string
 	 * @see             errors
@@ -64,24 +56,69 @@ class AccountancyCategory 	// extends CommonObject
 	 */
 	public $table_element='c_accounting_category';
 
-	public $id;
+	/**
+     * @var int 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;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $sens;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $category_type;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $formula;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $position;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $fk_country;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $active;
 
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $lines_cptbk;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $lines_display;
+
+	/**
+	 * @var mixed Sample property 1
+	 */
 	public $sdc;