From ae2df6be117acebcf826fda0e432772bd5a54e22 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 1 Sep 2018 23:04:46 +0200 Subject: [PATCH] Standardize and Update code --- .../accountancy/class/bookkeeping.class.php | 7 ++++-- htdocs/blockedlog/class/blockedlog.class.php | 3 ++- htdocs/cashdesk/class/Facturation.class.php | 7 +++++- .../comm/action/class/cactioncomm.class.php | 14 ++++++------ htdocs/compta/bank/class/bankcateg.class.php | 5 ++++- .../facture/class/paymentterm.class.php | 22 +++++++++---------- htdocs/core/class/ccountry.class.php | 6 ++--- htdocs/core/class/cstate.class.php | 12 +++++----- htdocs/core/class/ctypent.class.php | 14 ++++++------ htdocs/core/class/discount.class.php | 6 ++++- htdocs/core/class/html.formmail.class.php | 3 +++ htdocs/core/class/menubase.class.php | 5 ++++- htdocs/stripe/class/stripe.class.php | 9 ++++++++ 13 files changed, 72 insertions(+), 41 deletions(-) diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 38a4fb72028..cacf9b0a641 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -65,8 +65,7 @@ class BookKeeping extends CommonObject * @var int ID */ public $id; - /** - */ + public $doc_date; public $date_lim_reglement; public $doc_type; @@ -1865,7 +1864,11 @@ class BookKeeping extends CommonObject */ class BookKeepingLine { + /** + * @var int ID + */ public $id; + public $doc_date = ''; public $doc_type; public $doc_ref; diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index eaec787b099..dab99d80bc9 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -39,6 +39,7 @@ class BlockedLog * @var int */ public $id; + /** * Entity * @var int @@ -46,7 +47,7 @@ class BlockedLog public $entity; public $error = ''; - + /** * @var string[] Error codes (or messages) */ diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 755c48faf88..3051035813a 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -37,7 +37,12 @@ class Facturation * int $prix => Prix HT du produit en cours * int $tva => 'rowid' du taux de tva dans llx_c_tva */ - public $id; + + /** + * @var int ID + */ + public $id; + protected $ref; protected $qte; protected $stock; diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index 8f189c31e6e..f339e79d6a2 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -43,20 +43,20 @@ class CActionComm */ public $id; - var $code; - var $type; - var $libelle; // deprecated + public $code; + public $type; + public $libelle; // deprecated /** * @var string Type of agenda event label */ public $label; - var $active; - var $color; - var $picto; + public $active; + public $color; + public $picto; - var $type_actions=array(); + public $type_actions=array(); /** diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 3c07d9b49b9..10bcd9a07c4 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -32,7 +32,10 @@ class BankCateg // extends CommonObject //public $table_element='bank_categ'; //!< Name of table without prefix where object is stored public $picto='generic'; - public $id; + /** + * @var int ID + */ + public $id; /** * @var string bank categories label diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 2bdd288e748..619487e9574 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -32,7 +32,7 @@ class PaymentTerm // extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ @@ -42,24 +42,24 @@ class PaymentTerm // extends CommonObject * @var string[] Error codes (or messages) */ public $errors = array(); - + //public $element='c_payment_term'; //!< Id that identify managed objects //public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored - var $context =array(); + public $context =array(); /** * @var int ID */ public $id; - var $code; - var $sortorder; - var $active; - var $libelle; - var $libelle_facture; - var $type_cdr; - var $nbjour; - var $decalage; + public $code; + public $sortorder; + public $active; + public $libelle; + public $libelle_facture; + public $type_cdr; + public $nbjour; + public $decalage; diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php index f25e0a14ce5..2f9a8636c8b 100644 --- a/htdocs/core/class/ccountry.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -55,15 +55,15 @@ class Ccountry // extends CommonObject */ public $id; - var $code; - var $code_iso; + public $code; + public $code_iso; /** * @var string Countries label */ public $label; - var $active; + public $active; diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php index 3b1016aa55f..085da06c754 100644 --- a/htdocs/core/class/cstate.class.php +++ b/htdocs/core/class/cstate.class.php @@ -36,7 +36,7 @@ class Cstate // extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ @@ -46,7 +46,7 @@ class Cstate // extends CommonObject * @var string[] Error codes (or messages) */ public $errors = array(); - + //var $element='cstate'; //!< Id that identify managed objects //var $table_element='cstate'; //!< Name of table without prefix where object is stored @@ -54,10 +54,10 @@ class Cstate // extends CommonObject * @var int ID */ public $id; - - var $code_departement; - var $nom; - var $active; + + public $code_departement; + public $nom; + public $active; diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index aa3e6620d4f..9366cf6317b 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -31,7 +31,7 @@ class Ctypent // extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ @@ -41,7 +41,7 @@ class Ctypent // extends CommonObject * @var string[] Error codes (or messages) */ public $errors = array(); - + //var $element='ctypent'; //!< Id that identify managed objects //var $table_element='ctypent'; //!< Name of table without prefix where object is stored @@ -49,11 +49,11 @@ class Ctypent // extends CommonObject * @var int ID */ public $id; - - var $code; - var $libelle; - var $active; - var $module; + + public $code; + public $libelle; + public $active; + public $module; diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index 7ed51a5ed7c..78f713232d4 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -43,7 +43,11 @@ class DiscountAbsolute */ public $errors=array(); - public $id; // Id discount + /** + * @var int ID discount + */ + public $id; + public $fk_soc; public $discount_type; // 0 => customer discount, 1 => supplier discount public $amount_ht; // diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 17a8ec17939..cdc6a20ffa1 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1402,6 +1402,9 @@ class FormMail extends Form */ class ModelMail { + /** + * @var int ID + */ public $id; /** diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 5078d7759ea..7db88051e5e 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -43,7 +43,10 @@ class Menubase */ public $errors = array(); - public $id; + /** + * @var int ID + */ + public $id; public $menu_handler; public $module; diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php index b8a56b6aa15..68b3d8f8ef0 100644 --- a/htdocs/stripe/class/stripe.class.php +++ b/htdocs/stripe/class/stripe.class.php @@ -34,8 +34,14 @@ class Stripe extends CommonObject public $rowid; public $fk_soc; + public $fk_key; + + /** + * @var int ID + */ public $id; + public $mode; /** @@ -44,8 +50,11 @@ class Stripe extends CommonObject public $entity; public $statut; + public $type; + public $code; + public $message; /**