From a14c5209109d19f42ec4d648021edb5c28ac9c8d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Sep 2018 13:41:26 +0200 Subject: [PATCH] Standardize and update code --- .../expedition/mod_expedition_safor.php | 13 ++++++++++--- .../expensereport/mod_expensereport_jade.php | 13 ++++++++++--- .../expensereport/mod_expensereport_sand.php | 14 ++++++++++---- .../core/modules/facture/mod_facture_mars.php | 19 ++++++++++++++----- .../modules/facture/mod_facture_mercure.php | 11 ++++++++--- .../modules/facture/mod_facture_terre.php | 16 ++++++++++++---- 6 files changed, 64 insertions(+), 22 deletions(-) diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php index 2a20c22a88d..a16d3a41d07 100644 --- a/htdocs/core/modules/expedition/mod_expedition_safor.php +++ b/htdocs/core/modules/expedition/mod_expedition_safor.php @@ -28,13 +28,20 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/expedition/modules_expedition.php */ class mod_expedition_safor extends ModelNumRefExpedition { - var $version='dolibarr'; - var $prefix='SH'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; + + public $prefix='SH'; + /** * @var string Error code (or message) */ public $error=''; - var $nom='Safor'; + + public $nom='Safor'; /** diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php index b1e01d40bb9..2b32fc76152 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php @@ -28,13 +28,20 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/expensereport/modules_expenserepo */ class mod_expensereport_jade extends ModeleNumRefExpenseReport { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefix='ER'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $prefix='ER'; + /** * @var string Error code (or message) */ public $error=''; - var $nom='Jade'; + + public $nom='Jade'; /** diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index 4222bf163d5..67331873239 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -30,9 +30,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/expensereport/modules_expenserepo */ class mod_expensereport_sand extends ModeleNumRefExpenseReport { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $error = ''; - var $nom = 'Sand'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $error = ''; + + public $nom = 'Sand'; /** @@ -42,7 +48,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport */ function info() { - global $conf,$langs; + global $conf, $langs; $langs->load("bills"); diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php index 5a2d1281385..a1ed1e32d24 100644 --- a/htdocs/core/modules/facture/mod_facture_mars.php +++ b/htdocs/core/modules/facture/mod_facture_mars.php @@ -30,11 +30,20 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; */ class mod_facture_mars extends ModeleNumRefFactures { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefixinvoice='FA'; - var $prefixreplacement='FR'; - var $prefixdeposit='AC'; - var $prefixcreditnote='AV'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $prefixinvoice='FA'; + + public $prefixreplacement='FR'; + + public $prefixdeposit='AC'; + + public $prefixcreditnote='AV'; + /** * @var string Error code (or message) */ diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index 89c526bc334..c2ebf678cc7 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -33,8 +33,13 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; */ class mod_facture_mercure extends ModeleNumRefFactures { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $error = ''; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $error = ''; /** @@ -44,7 +49,7 @@ class mod_facture_mercure extends ModeleNumRefFactures */ function info() { - global $conf,$langs; + global $conf, $langs; $langs->load("bills"); diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index 524eeebdd5f..a55418a8cb5 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -29,10 +29,18 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; */ class mod_facture_terre extends ModeleNumRefFactures { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefixinvoice='FA'; - var $prefixcreditnote='AV'; - var $prefixdeposit='AC'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $prefixinvoice='FA'; + + public $prefixcreditnote='AV'; + + public $prefixdeposit='AC'; + /** * @var string Error code (or message) */