From ba6a48360e0e1889cfd4ef4c2350b1d1a6652762 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 30 Aug 2018 12:26:59 +0200 Subject: [PATCH 1/3] Standardize and update code --- .../class/accountancycategory.class.php | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 1f81767f80d..4bb7e5aaf66 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/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; - public $code; - /** - * @var string proper name for given parameter - */ - public $label; - + * @var int ID + */ + public $id; + + /** + * @var mixed Sample property 1 + */ + public $code; + + /** + * @var string proper name for given parameter + */ + 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; From e96e3bdf42e2b594ac560626b6d0494666ff9141 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 30 Aug 2018 14:19:21 +0200 Subject: [PATCH 2/3] Update accountancycategory.class.php --- .../class/accountancycategory.class.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 4bb7e5aaf66..3673f6df204 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/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. - */ - public $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error string @@ -57,21 +57,21 @@ class AccountancyCategory // extends CommonObject public $table_element='c_accounting_category'; /** - * @var int ID - */ - public $id; + * @var int ID + */ + public $id; /** * @var mixed Sample property 1 */ public $code; - /** - * @var string proper name for given parameter - */ - public $label; + /** + * @var string proper name for given parameter + */ + public $label; - /** + /** * @var mixed Sample property 1 */ public $range_account; From 5ec22d9fadf19a4e79b5caceadc5527b62f7af8d Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 30 Aug 2018 14:25:25 +0200 Subject: [PATCH 3/3] Update accountingaccount.class.php --- .../class/accountingaccount.class.php | 37 +++++++------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 08ae8359c96..1447ff0e7b4 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/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 proper name for given parameter + + /** + * @var string Label of account */ public $label; - - var $fk_user_author; - var $fk_user_modif; - var $active; // duplicate with status -======= - /** - * @var string Label of account - */ - public $label; + /** + * @var int ID + */ + public $fk_user_author; - /** - * @var int ID - */ - public $fk_user_author; + /** + * @var int ID + */ + public $fk_user_modif; - /** - * @var int ID - */ - public $fk_user_modif; - - var $active; // duplicate with status ->>>>>>> upstream/develop + var $active; // duplicate with status + var $status;