From 88bf2dee642979e02e7a1b605d300fff8b15ece5 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 20 Sep 2018 13:36:00 +0200
Subject: [PATCH] Standardize and update code

---
 .../modules/commande/mod_commande_saphir.php  | 12 ++++++++---
 .../modules/contract/mod_contract_magre.php   | 15 ++++++++++----
 .../modules/contract/mod_contract_olive.php   | 20 ++++++++++++-------
 .../modules/contract/mod_contract_serpis.php  | 16 +++++++++++----
 .../expedition/mod_expedition_ribera.php      | 12 ++++++++---
 5 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index ae856072049..cf91dbfc36f 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -33,9 +33,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php';
  */
 class mod_commande_saphir extends ModeleNumRefCommandes
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $error = '';
-	var $nom = 'Saphir';
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+
+	public $error = '';
+
+	public $nom = 'Saphir';
 
 
     /**
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index 72c8c5bef23..5e09a57a997 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -29,10 +29,17 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_magre extends ModelNumRefContracts
 {
-	var $version='dolibarr';
-	var $error = '';
-	var $nom = 'Magre';
-	var $code_auto=1;
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
+
+	public $error = '';
+
+	public $nom = 'Magre';
+
+	public $code_auto=1;
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 6d22aebeb3d..3602a0d3291 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -34,13 +34,19 @@ class mod_contract_olive extends ModelNumRefContracts
 {
 
 
-	var $nom='Olive';					// Nom du modele
-	var $code_modifiable = 1;				// Code modifiable
-	var $code_modifiable_invalide = 1;		// Code modifiable si il est invalide
-	var $code_modifiable_null = 1;			// Code modifiables si il est null
-	var $code_null = 1;						// Code facultatif
-	var $version='dolibarr';    		// 'development', 'experimental', 'dolibarr'
-	var $code_auto = 0; 	                // Numerotation automatique
+	public $nom='Olive';					// Nom du modele
+	public $code_modifiable = 1;				// Code modifiable
+	public $code_modifiable_invalide = 1;		// Code modifiable si il est invalide
+	public $code_modifiable_null = 1;			// Code modifiables si il est null
+	public $code_null = 1;						// Code facultatif
+
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
+
+	public $code_auto = 0; 	                // Numerotation automatique
 
 
 	/**
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index ca7ba32184f..ea1064e7db6 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -28,14 +28,22 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_serpis extends ModelNumRefContracts
 {
-	var $version='dolibarr';
-	var $prefix='CT';
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
+
+	public $prefix='CT';
+
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error='';
-	var $nom='Serpis';
-	var $code_auto=1;
+
+	public $nom='Serpis';
+
+	public $code_auto=1;
 
 
 	/**
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index dadde0fd814..973567de2fb 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -29,9 +29,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/expedition/modules_expedition.php
  */
 class mod_expedition_ribera extends ModelNumRefExpedition
 {
-	var $version='dolibarr';
-	var $error = '';
-	var $nom = 'Ribera';
+	/**
+     * Dolibarr version of the loaded document
+     * @public string
+     */
+	public $version = 'dolibarr';
+
+	public $error = '';
+
+	public $nom = 'Ribera';
 
 	/**
 	 *	Return default description of numbering model