From 2adfdab77138c0427b064cdcb9026d1c2ae08784 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Sep 2018 15:14:59 +0200 Subject: [PATCH] Standardize and update code --- htdocs/core/modules/project/mod_project_simple.php | 12 ++++++++++-- .../core/modules/project/mod_project_universal.php | 12 ++++++++++-- htdocs/core/modules/propale/mod_propale_marbre.php | 12 +++++++++++- htdocs/core/modules/propale/mod_propale_saphir.php | 12 +++++++++++- .../core/modules/societe/mod_codeclient_elephant.php | 12 ++++++++++-- .../core/modules/societe/mod_codeclient_leopard.php | 12 ++++++++++-- .../core/modules/societe/mod_codeclient_monkey.php | 12 ++++++++++-- .../core/modules/societe/mod_codecompta_aquarium.php | 8 ++++++++ .../core/modules/societe/mod_codecompta_panicum.php | 8 ++++++++ 9 files changed, 88 insertions(+), 12 deletions(-) diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 8fef9abd7bd..94f2db957a3 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -44,9 +44,17 @@ class mod_project_simple extends ModeleNumRefProjects */ public $error=''; - public $nom = "Simple"; + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Simple'; - public $name = "Simple"; + /** + * @var string model name + */ + public $name='Simple'; /** diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index f9ce0b38c62..0d11ac820c0 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -41,9 +41,17 @@ class mod_project_universal extends ModeleNumRefProjects */ public $error = ''; - public $nom = 'Universal'; + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Universal'; - public $name = 'Universal'; + /** + * @var string model name + */ + public $name='Universal'; /** diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index d6ff9a831b8..427d4596636 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -44,7 +44,17 @@ class mod_propale_marbre extends ModeleNumRefPropales */ public $error=''; - public $nom = "Marbre"; + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Marbre'; + + /** + * @var string model name + */ + public $name='Marbre'; /** diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php index fab4d2b86e7..913743eb93d 100644 --- a/htdocs/core/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -44,7 +44,17 @@ class mod_propale_saphir extends ModeleNumRefPropales */ public $error = ''; - public $nom = 'Saphir'; + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Saphir'; + + /** + * @var string model name + */ + public $name='Saphir'; /** diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 312526e93a1..621bbd08d3e 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -34,9 +34,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codeclient_elephant extends ModeleThirdPartyCode { - public $nom='Elephant'; // Nom du modele + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Elephant'; - public $name='Elephant'; // Nom du modele + /** + * @var string model name + */ + public $name='Elephant'; public $code_modifiable; // Code modifiable diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index b9f214c0623..9bdd27d5bee 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -38,9 +38,17 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode * Le fonctionnement de celui-ci doit donc rester le plus ouvert possible */ - public $nom='Leopard'; // Nom du modele + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Leopard'; - public $name='Leopard'; // Nom du modele + /** + * @var string model name + */ + public $name='Leopard'; public $code_modifiable; // Code modifiable diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 639aff8bc53..d914f6953ae 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -32,9 +32,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codeclient_monkey extends ModeleThirdPartyCode { - public $nom='Monkey'; // Nom du modele + /** + * @var string Nom du modele + * @deprecated + * @see name + */ + public $nom='Monkey'; - public $name='Monkey'; // Nom du modele + /** + * @var string model name + */ + public $name='Monkey'; public $code_modifiable; // Code modifiable diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index ff759cc5cc2..772b28f3d6c 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -31,8 +31,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codecompta_aquarium extends ModeleAccountancyCode { + /** + * @var string Nom du modele + * @deprecated + * @see name + */ public $nom='Aquarium'; + /** + * @var string model name + */ public $name='Aquarium'; /** diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php index 3919539d8d0..c1e83b75db4 100644 --- a/htdocs/core/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -30,8 +30,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' */ class mod_codecompta_panicum extends ModeleAccountancyCode { + /** + * @var string Nom du modele + * @deprecated + * @see name + */ public $nom='Panicum'; + /** + * @var string model name + */ public $name='Panicum'; /**