From 92a484dcd9324c26197054b750e44aaa5b6d96bc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 20 Sep 2018 15:07:43 +0200
Subject: [PATCH] Standardize and update code

---
 .../core/modules/livraison/mod_livraison_jade.php  | 12 +++++++++++-
 .../modules/livraison/mod_livraison_saphir.php     | 14 ++++++++++++--
 htdocs/core/modules/payment/mod_payment_ant.php    | 12 +++++++++++-
 htdocs/core/modules/payment/mod_payment_cicada.php | 10 ++++++++++
 .../modules/product/mod_codeproduct_elephant.php   | 12 ++++++++++--
 .../modules/product/mod_codeproduct_leopard.php    | 12 ++++++++++--
 6 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index eed356336b0..1fd598d02a7 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -45,7 +45,17 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 	 */
 	public $error = '';
 
-	public $nom = "Jade";
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Jade';
+
+	/**
+	 * @var string model name
+	 */
+	public $name='Jade';
 
     public $prefix='BL';
 
diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php
index 1a07341c520..cbe105ef75c 100644
--- a/htdocs/core/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php
@@ -42,7 +42,17 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 	 */
 	public $error = '';
 
-	public $nom = 'Saphir';
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Saphir';
+
+	/**
+	 * @var string model name
+	 */
+	public $name='Saphir';
 
 
     /**
@@ -52,7 +62,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
      */
 	function info()
 	{
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index cc66b39e4f4..b7d88464355 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -41,7 +41,17 @@ class mod_payment_ant extends ModeleNumRefPayments
 	 */
 	public $error = '';
 
-	public $nom = 'Ant';
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
+	public $nom='Ant';
+
+	/**
+	 * @var string model name
+	 */
+	public $name='Ant';
 
 
     /**
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 1fce35f93cb..5869032cc5b 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -42,8 +42,18 @@ class mod_payment_cicada extends ModeleNumRefPayments
 	 */
 	public $error='';
 
+	/**
+	 * @var string Nom du modele
+	 * @deprecated
+	 * @see name
+	 */
 	public $nom='Cicada';
 
+	/**
+	 * @var string model name
+	 */
+	public $name='Cicada';
+
 
     /**
      *  Return description of numbering module
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 8910805b3cb..f051fab7f8e 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -34,9 +34,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'
  */
 class mod_codeproduct_elephant extends ModeleProductCode
 {
-	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/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index de9d281c92f..815e383d900 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -39,9 +39,17 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	 * 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