diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index a72c6c5af9460..66c4f0a3e45d3 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -45,17 +45,23 @@ class CommActionRapport */ public $description; - var $date_edition; - var $year; - var $month; + public $date_edition; - var $title; - var $subject; + public $year; - var $marge_gauche; - var $marge_droite; - var $marge_haute; - var $marge_basse; + public $month; + + public $title; + + public $subject; + + public $marge_gauche; + + public $marge_droite; + + public $marge_haute; + + public $marge_basse; /** @@ -67,7 +73,7 @@ class CommActionRapport */ function __construct($db, $month, $year) { - global $conf,$langs; + global $conf, $langs; // Load translation files required by the page $langs->loadLangs(array("commercial","projects")); diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index a7ebc8bf5e17e..886ff87520a59 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -33,11 +33,15 @@ */ class mod_barcode_product_standard extends ModeleNumRefBarCode { - var $name='Standard'; // Model Name - var $code_modifiable; // Editable code - var $code_modifiable_invalide; // Modified code if it is invalid - var $code_modifiable_null; // Modified code if it is null - var $code_null; // Optional code + public $name='Standard'; // Model Name + + public $code_modifiable; // Editable code + + public $code_modifiable_invalide; // Modified code if it is invalid + + public $code_modifiable_null; // Modified code if it is null + + public $code_null; // Optional code /** * Dolibarr version of the loaded document @@ -45,11 +49,13 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - var $code_auto; // Automatic Numbering + public $code_auto; // Automatic Numbering + + public $searchcode; // Search string + + public $numbitcounter; // Number of digits the counter - var $searchcode; // Search string - var $numbitcounter; // Number of digits the counter - var $prefixIsRequired; // The prefix field of third party must be filled when using {pre} + public $prefixIsRequired; // The prefix field of third party must be filled when using {pre} /** diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php index bcd3b34df04db..8345d694cfff4 100644 --- a/htdocs/core/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -42,8 +42,18 @@ class mod_commande_marbre extends ModeleNumRefCommandes */ public $error=''; + /** + * @var string + * @deprecated + * @see name + */ public $nom='Marbre'; + /** + * @var string name + */ + public $name='Marbre'; + /** * Return description of numbering module diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php index 6850fa2c57dd4..588d6fffc6d17 100644 --- a/htdocs/core/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -44,7 +44,17 @@ class mod_commande_saphir extends ModeleNumRefCommandes */ public $error = ''; - public $nom = 'Saphir'; + /** + * @var string nom + * @deprecated + * @see name + */ + public $nom='Saphir'; + + /** + * @var string name + */ + public $name='Saphir'; /** diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index ef6d100c2b643..4769ec17f9997 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -40,7 +40,17 @@ class mod_contract_magre extends ModelNumRefContracts */ public $error = ''; - public $nom = 'Magre'; + /** + * @var string nom + * @deprecated + * @see name + */ + public $nom='Magre'; + + /** + * @var string name + */ + public $name='Magre'; public $code_auto=1;