From 65af8f902f9c82d5824318e126a4914731affb1b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 28 Aug 2018 09:44:54 +0200 Subject: [PATCH] Update and standardize code --- .../class/accountancycategory.class.php | 7 ++++++- .../accountancy/class/accountingaccount.class.php | 6 +++--- .../accountancy/class/accountingjournal.class.php | 7 ++++++- htdocs/asset/class/asset.class.php | 7 ++++++- htdocs/categories/class/categorie.class.php | 7 ++++++- htdocs/compta/bank/class/bankcateg.class.php | 6 +++++- .../compta/salaries/class/paymentsalary.class.php | 7 ++++++- htdocs/core/class/ctyperesource.class.php | 14 ++++++++++++-- htdocs/core/class/html.formmail.class.php | 7 ++++++- htdocs/core/class/link.class.php | 5 +++++ htdocs/core/modules/import/modules_import.php | 7 ++++++- 11 files changed, 67 insertions(+), 13 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 7f0b2be0071..b919e7b70ee 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -58,7 +58,12 @@ class AccountancyCategory // extends CommonObject public $id; public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $range_account; public $sens; public $category_type; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 6a72b881aab..99c23604703 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -81,9 +81,9 @@ class AccountingAccount extends CommonObject var $account_category; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; var $fk_user_author; var $fk_user_modif; diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index c908b4ccb7c..af084f16b5f 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -43,7 +43,12 @@ class AccountingJournal extends CommonObject var $rowid; public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new public $active; diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index 002dca8bf56..9e722310983 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -98,7 +98,12 @@ class Asset extends CommonObject public $rowid; public $ref; public $entity; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $amount; public $fk_soc; public $description; diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 3736ce58d5b..381263b9097 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -159,7 +159,12 @@ class Categorie extends CommonObject public $table_element='categorie'; public $fk_parent; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $description; /** * @var string Color diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 44e4f72c496..ad470148abc 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -33,7 +33,11 @@ class BankCateg // extends CommonObject public $picto='generic'; public $id; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; /** diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index babd5323fce..00eac1ac3b4 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -51,7 +51,12 @@ class PaymentSalary extends CommonObject public $fk_project; public $type_payment; public $num_payment; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $datesp; public $dateep; public $fk_bank; diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index 9e0e5b90377..f7c84ceae98 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -48,7 +48,12 @@ class Ctyperesource public $lines = array(); public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $active; @@ -480,7 +485,12 @@ class CtyperesourceLine */ public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $active; /** diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 0a1e3c26f2f..f06cc5da0dd 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1395,7 +1395,12 @@ class FormMail extends Form class ModelMail { public $id; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $topic; public $content; public $content_lines; diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index 0d695baaf8d..951c6e75b02 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -41,7 +41,12 @@ class Link extends CommonObject public $entity; public $datea; public $url; + + /** + * @var string proper name for given parameter + */ public $label; + public $objecttype; public $objectid; diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 7c26fdb68d3..429f1cdbae8 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -40,7 +40,12 @@ class ModeleImports public $error=''; public $id; // Id of driver - public $label; // Label of driver + + /** + * @var string proper name for given parameter + */ + public $label; + public $extension; // Extension of files imported by driver public $version; // Version of driver