Fix code not reachable

This commit is contained in:
Laurent Destailleur 2016-11-13 18:15:31 +01:00
parent 348e004da6
commit fe1c83b206
2 changed files with 3 additions and 9 deletions

View File

@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
/** /**
* \class mod_facture_mercure * Class of numbering module Mercure for invoices
* \brief Classe du modele de numerotation de reference de facture Mercure
*/ */
class mod_facture_mercure extends ModeleNumRefFactures class mod_facture_mercure extends ModeleNumRefFactures
{ {

View File

@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_invoice/modules_facturef
/** /**
* \class mod_facture_fournisseur_cactus * Cactus Class of numbering models of suppliers invoices references
* \brief Cactus Class of numbering models of suppliers invoices references
*/ */
class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
{ {
@ -91,11 +90,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
$row = $db->fetch_row($resql); $row = $db->fetch_row($resql);
if ($row) { $siyymm = substr($row[0],0,6); $max=$row[0]; } 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)) if ($siyymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$siyymm))
{
return true;
}
else
{ {
$langs->load("errors"); $langs->load("errors");
$this->error=$langs->trans('ErrorNumRefModel',$max); $this->error=$langs->trans('ErrorNumRefModel',$max);