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

---
 .../core/modules/contract/mod_contract_olive.php   | 14 +++++++++++++-
 .../core/modules/contract/mod_contract_serpis.php  | 10 ++++++++++
 .../modules/expedition/mod_expedition_ribera.php   | 12 +++++++++++-
 .../modules/expedition/mod_expedition_safor.php    | 10 ++++++++++
 .../expensereport/mod_expensereport_jade.php       | 10 ++++++++++
 .../expensereport/mod_expensereport_sand.php       | 12 +++++++++++-
 6 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 3602a0d3291..993f4bf9bfb 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -32,12 +32,24 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_olive extends ModelNumRefContracts
 {
+    /**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Olive';
 
+	/**
+	 * @var string model name
+	 */
+	public $name='Olive';
 
-	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
 
 	/**
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index ea1064e7db6..e91775f669c 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -41,8 +41,18 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 */
 	public $error='';
 
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
 	public $nom='Serpis';
 
+	/**
+	 * @var string model name
+	 */
+	public $name='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 48f21d037eb..35a5eb2325b 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -40,7 +40,17 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 */
 	public $error = '';
 
-	public $nom = 'Ribera';
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Ribera';
+
+	/**
+	 * @var string model name
+	 */
+	public $name='Ribera';
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index a16d3a41d07..2ebf9335755 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -41,8 +41,18 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 */
 	public $error='';
 
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
 	public $nom='Safor';
 
+	/**
+	 * @var string model name
+	 */
+	public $name='Safor';
+
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 2b32fc76152..385a7558c4c 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -41,8 +41,18 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 	 */
 	public $error='';
 
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
 	public $nom='Jade';
 
+	/**
+	 * @var string model name
+	 */
+	public $name='Jade';
+
 
     /**
      *  Return description of numbering module
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index f3a818620b3..95cc3d39c95 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -41,7 +41,17 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 	 */
 	public $error = '';
 
-	public $nom = 'Sand';
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Sand';
+
+	/**
+	 * @var string model name
+	 */
+	public $name='Sand';
 
 
     /**