From fe1c83b206d5c8418eb3819600fec8b563ed3b69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Nov 2016 18:15:31 +0100
Subject: [PATCH] Fix code not reachable

---
 htdocs/core/modules/facture/mod_facture_mercure.php      | 3 +--
 .../supplier_invoice/mod_facture_fournisseur_cactus.php  | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 2c873412da5..e826b18f0e0 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
 
 
 /**
- *	\class      mod_facture_mercure
- *	\brief      Classe du modele de numerotation de reference de facture Mercure
+ *	Class of numbering module Mercure for invoices
  */
 class mod_facture_mercure extends ModeleNumRefFactures
 {
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 0a4f5d98c46..6e875af78f2 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_invoice/modules_facturef
 
 
 /**
- *  \class mod_facture_fournisseur_cactus
- *  \brief Cactus Class of numbering models of suppliers invoices references
+ *  Cactus Class of numbering models of suppliers invoices references
  */
 class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 {
@@ -91,11 +90,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 			$row = $db->fetch_row($resql);
 			if ($row) { $siyymm = substr($row[0],0,6); $max=$row[0]; }
 		}
-		if (! $siyymm || preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$siyymm))
-		{
-			return true;
-		}
-		else
+		if ($siyymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$siyymm))
 		{
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);