From f630e2100abb79ec9a3c78362eb9f44530d33452 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 28 Sep 2018 14:32:57 +0200 Subject: [PATCH 1/5] Standardize and update code --- htdocs/adherents/class/adherent_type.class.php | 6 ++++-- htdocs/asset/class/asset.class.php | 10 +++++----- htdocs/asset/class/asset_type.class.php | 6 ++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index a9d7fd7ead3..dffd1446af0 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -56,8 +56,10 @@ class AdherentType extends CommonObject */ public $libelle; - /** @var string Label */ - public $label; + /** + * @var string Adherent type label + */ + public $label; /** * @var int Subsription required (0 or 1) diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index dbd472af1d3..8aee71b4926 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -108,17 +108,17 @@ class Asset extends CommonObject public $entity; - /** - * @var string Asset label - */ - public $label; + /** + * @var string Asset label + */ + public $label; public $amount; /** * @var int Thirdparty ID */ - public $fk_soc; + public $fk_soc; /** * @var string description diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php index df2f4c1415e..f1c6f9d771b 100644 --- a/htdocs/asset/class/asset_type.class.php +++ b/htdocs/asset/class/asset_type.class.php @@ -46,8 +46,10 @@ class AssetType extends CommonObject public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe - /** @var string Label */ - public $label; + /** + * @var string Asset type label + */ + public $label; /** @var string Accountancy code asset */ public $accountancy_code_asset; From 15ff9f89179c7eab67822a090bb414919949ae8d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 28 Sep 2018 14:44:47 +0200 Subject: [PATCH 2/5] Standardize and update code --- htdocs/compta/bank/class/account.class.php | 2 +- htdocs/core/class/emailsenderprofile.class.php | 6 +++++- htdocs/cron/class/cronjob.class.php | 16 +++++++++++++--- htdocs/ecm/class/ecmfiles.class.php | 12 ++++++++++-- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index c45067740af..b9d19ba5b64 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -59,7 +59,7 @@ class Account extends CommonObject public $rowid; /** - * Label + * Account Label * @var string */ public $label; diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php index d2bf33b5461..c5304fec31c 100644 --- a/htdocs/core/class/emailsenderprofile.class.php +++ b/htdocs/core/class/emailsenderprofile.class.php @@ -99,7 +99,11 @@ class EmailSenderProfile extends CommonObject */ public $entity; - public $label; + /** + * @var string Email Sender Profile label + */ + public $label; + public $email; public $date_creation; public $tms; diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index dc853e0da7d..a0db4a1f572 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; /** - * Crob Job class + * Cron Job class */ class Cronjob extends CommonObject { @@ -53,7 +53,12 @@ class Cronjob extends CommonObject public $jobtype; public $tms=''; public $datec=''; - public $label; + + /** + * @var string Cron Job label + */ + public $label; + public $command; public $classesname; public $objectname; @@ -1351,7 +1356,12 @@ class Cronjobline public $tms=''; public $datec=''; - public $label; + + /** + * @var string Cron Job Line label + */ + public $label; + public $jobtype; public $command; public $classesname; diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 54077a68de6..50dbcb60dc6 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -56,7 +56,12 @@ class EcmFiles extends CommonObject */ public $ref; - public $label; // hash of file content (md5_file(dol_osencode($destfull)) + /** + * hash of file content (md5_file(dol_osencode($destfull)) + * @var string Ecm Files label + */ + public $label; + public $share; // hash for file sharing, empty by default (example: getRandomPassword(true)) /** @@ -848,7 +853,10 @@ class EcmFiles extends CommonObject class EcmfilesLine { - public $label; + /** + * @var string ECM files line label + */ + public $label; /** * @var int Entity From 574cfad48fac6c7ea8f09c8a4394894f7bd028e5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 28 Sep 2018 14:49:34 +0200 Subject: [PATCH 3/5] Standardize and update code --- htdocs/fourn/class/fournisseur.commande.class.php | 5 +++++ htdocs/loan/class/loan.class.php | 13 +++++++++---- .../modulebuilder/template/class/myobject.class.php | 6 +++++- htdocs/product/stock/class/mouvementstock.class.php | 7 ++++++- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index dae79f4426e..5608fbe4b57 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -3159,7 +3159,12 @@ class CommandeFournisseurLigne extends CommonOrderLine // From llx_commande_fournisseurdet public $fk_parent_line; public $fk_facture; + + /** + * @var string supplier order line label + */ public $label; + public $rang = 0; public $special_code = 0; diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index e0e4b590c1a..dd066f0064c 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -50,7 +50,12 @@ class Loan extends CommonObject public $datestart; public $dateend; - public $label; + + /** + * @var string Loan label + */ + public $label; + public $capital; public $nbterm; public $rate; @@ -454,7 +459,7 @@ class Loan extends CommonObject return $result; } - + /** * Initialise an instance with random values. * Used to build previews or test instances. @@ -465,9 +470,9 @@ class Loan extends CommonObject function initAsSpecimen() { global $user, $langs, $conf; - + $now=dol_now(); - + // Initialise parameters $this->id = 0; $this->fk_bank = 1; diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index c5355958833..0439f78f3a5 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -116,7 +116,11 @@ class MyObject extends CommonObject */ public $entity; - public $label; + /** + * @var string label + */ + public $label; + public $amount; public $status; public $date_creation; diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 76225ff8902..0d8338c4d9f 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -50,7 +50,12 @@ class MouvementStock extends CommonObject public $datem = ''; public $price; public $fk_user_author; - public $label; + + /** + * @var string stock movements label + */ + public $label; + public $fk_origin; public $origintype; public $inventorycode; From 61ad84d6e1baba0179d4ff4ba0456b5cf979b8cb Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 28 Sep 2018 15:19:45 +0200 Subject: [PATCH 4/5] Fix Travis Error:The closing brace for the class must go on the next line after the body --- htdocs/core/modules/modTakePos.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php index bc818b9a903..0c22b7c2dc4 100644 --- a/htdocs/core/modules/modTakePos.class.php +++ b/htdocs/core/modules/modTakePos.class.php @@ -333,5 +333,4 @@ class modTakePos extends DolibarrModules return $this->_remove($sql, $options); } - } From b183054073e9fa37615c683c240a9527e5a986c9 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 28 Sep 2018 15:57:13 +0200 Subject: [PATCH 5/5] Standardize and update code --- htdocs/societe/class/address.class.php | 14 ++++++++++++-- htdocs/societe/class/companypaymentmode.class.php | 6 +++++- htdocs/ticket/class/actions_ticket.class.php | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 5f8d8036b22..37a350b81ff 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -39,7 +39,12 @@ class Address public $id; public $type; - public $label; + + /** + * @var string Address label + */ + public $label; + public $socid; public $name; public $address; @@ -510,7 +515,12 @@ class AddressLine public $date_creation; public $date_modification; - public $label; + + /** + * @var string stock movements label + */ + public $label; + public $name; public $address; public $zip; diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php index d948ba1d237..f5ef70c2407 100644 --- a/htdocs/societe/class/companypaymentmode.class.php +++ b/htdocs/societe/class/companypaymentmode.class.php @@ -129,7 +129,11 @@ class CompanyPaymentMode extends CommonObject */ public $fk_soc; - public $label; + /** + * @var string company payment mode label + */ + public $label; + public $bank; public $code_banque; public $code_guichet; diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php index 845ca8ca773..2fd26b5797b 100644 --- a/htdocs/ticket/class/actions_ticket.class.php +++ b/htdocs/ticket/class/actions_ticket.class.php @@ -60,6 +60,9 @@ class ActionsTicket public $template_dir; public $template; + /** + * @var string ticket action label + */ public $label; /**