diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index aaa1949d7dd..7c0d7fdbf9c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -348,18 +348,16 @@ foreach ($dirmodels as $reldir)
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$commande->type=0;
$nextval=$module->getNextValue($mysoc,$commande);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'
';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'
';
- }
- }
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
+ $htmltooltip.=''.$langs->trans("NextValue").': ';
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
+ $htmltooltip.=$nextval.'
';
+ } else {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
+ }
print '';
print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 817ac84d768..45d79f01ae5 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -299,18 +299,16 @@ foreach ($dirmodels as $reldir)
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$nextval=$module->getNextValue($mysoc,$contract);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'
';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'
';
- }
- }
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
+ $htmltooltip.=''.$langs->trans("NextValue").': ';
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
+ $htmltooltip.=$nextval.'
';
+ } else {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
+ }
print ' | ';
print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 2efdfdd56ba..933f9a87d18 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -324,18 +324,16 @@ foreach ($dirmodels as $reldir)
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$nextval=$module->getNextValue($mysoc,$expedition);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'
';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'
';
- }
- }
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
+ $htmltooltip.=''.$langs->trans("NextValue").': ';
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
+ $htmltooltip.=$nextval.'
';
+ } else {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
+ }
print ' | ';
print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index a7692655a0a..298c0beddf5 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -393,61 +393,53 @@ foreach ($dirmodels as $reldir)
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$facture->type=0;
$nextval=$module->getNextValue($mysoc,$facture);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=$langs->trans("NextValueForInvoices").': ';
- if ($nextval)
- {
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval.'
';
- }
- else
- {
+ } else {
$htmltooltip.=$langs->trans($module->error).'
';
}
}
// Example for remplacement
$facture->type=1;
$nextval=$module->getNextValue($mysoc,$facture);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=$langs->trans("NextValueForReplacements").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'
';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'
';
- }
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
+ $htmltooltip.=$langs->trans("NextValueForReplacements").': ';
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
+ $htmltooltip.=$nextval.'
';
+ } else {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
}
// Example for credit invoice
$facture->type=2;
$nextval=$module->getNextValue($mysoc,$facture);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=$langs->trans("NextValueForCreditNotes").': ';
- if ($nextval)
- {
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval.'
';
- }
- else
- {
+ } else {
$htmltooltip.=$langs->trans($module->error).'
';
}
}
// Example for deposit invoice
$facture->type=3;
$nextval=$module->getNextValue($mysoc,$facture);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=$langs->trans("NextValueForDeposit").': ';
- if ($nextval)
- {
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval;
- }
- else
- {
+ } else {
$htmltooltip.=$langs->trans($module->error);
}
}
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index dad5f484a4d..8965b225cfb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004 Sebastien Di Cintio
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2005-2014 Regis Houssin
- * Copyright (C) 2008 Raphael Bertrand (Resultic)
+ * Copyright (C) 2008 Raphael Bertrand (Resultic)
* Copyright (C) 2011-2013 Juanjo Menent
* Copyright (C) 2011-2013 Philippe Grand
*
@@ -328,10 +328,16 @@ foreach ($dirmodels as $reldir)
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$nextval=$module->getNextValue($mysoc,$ficheinter);
- if ($nextval != $langs->trans("NotAvailable"))
- {
- $htmltooltip.=''.$langs->trans("NextValue").': '.$nextval;
- }
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
+ $htmltooltip.=''.$langs->trans("NextValue").': ';
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
+ $htmltooltip.=$nextval.'
';
+ } else {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
+ }
print '';
print $form->textwithpicto('',$htmltooltip,1,0);
print ' | ';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index b591aa79c08..69f5d30b09a 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -309,15 +309,13 @@ foreach ($dirmodels as $reldir)
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$nextval=$module->getNextValue($mysoc,$livraison);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval.'
';
- }
- else
- {
+ } else {
$htmltooltip.=$langs->trans($module->error).'
';
}
}
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 01f32740036..30ae7e71ab3 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -344,18 +344,16 @@ foreach ($dirmodels as $reldir)
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$propal->type=0;
$nextval=$module->getNextValue($mysoc,$propal);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'
';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'
';
- }
- }
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
+ $htmltooltip.=''.$langs->trans("NextValue").': ';
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
+ $htmltooltip.=$nextval.'
';
+ } else {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
+ }
print '';
print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 2f48eb2be79..19b5e89b0dd 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -278,15 +278,13 @@ foreach ($dirmodels as $reldir)
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$nextval=$module->getNextValue($mysoc,$invoice);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval.'
';
- }
- else
- {
+ } else {
$htmltooltip.=$langs->trans($module->error).'
';
}
}
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 2d4be98f34a..24e1682eb18 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -279,15 +279,13 @@ foreach ($dirmodels as $reldir)
$htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
$nextval=$module->getNextValue($mysoc,$commande);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
+ if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
+ if ($nextval) {
+ if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+ $nextval = $langs->trans($nextval);
$htmltooltip.=$nextval.'
';
- }
- else
- {
+ } else {
$htmltooltip.=$langs->trans($module->error).'
';
}
}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 7517fac7d20..602e308df41 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -608,7 +608,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$maskraz=-1;
$maskoffset=0;
$resetEveryMonth=false;
- if (dol_strlen($maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+ if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
// Extract value for third party mask counter
if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -620,7 +620,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
$maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
$maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
- if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+ if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
}
else $maskrefclient='';
@@ -650,7 +650,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
// Now maskwithnocode = 0000ddmmyyyyccc for example
// and maskcounter = 0000 for example
//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
";
- //var_dump($reg);
+ //var_dump($reg);
// If an offset is asked
if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
@@ -667,17 +667,16 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
//print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
- $maskraz=$yearoffsettype; // For backward compatibility
+ $maskraz=$yearoffsettype; // For backward compatibility
else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
- $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+ $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
//print "maskraz=".$maskraz; // -1=no reset
- if ($maskraz > 0) // A reset is required
- {
- if ($maskraz == 99) {
- $maskraz = date('m', $date);
- $resetEveryMonth = true;
- }
+ if ($maskraz > 0) { // A reset is required
+ if ($maskraz == 99) {
+ $maskraz = date('m', $date);
+ $resetEveryMonth = true;
+ }
if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
// Define posy, posm and reg
@@ -964,7 +963,7 @@ function check_value($mask,$value)
$maskcounter=$reg[1];
$maskraz=-1;
$maskoffset=0;
- if (dol_strlen($maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+ if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
// Extract value for third party mask counter
if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -976,7 +975,7 @@ function check_value($mask,$value)
$maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
$maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
$maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
- if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+ if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
}
else $maskrefclient='';
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 35b7da13728..08b031690b4 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -91,6 +91,8 @@ ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup
ErrorBadMask=Error on mask
ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Max number reach for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
ErrorSelectAtLeastOne=Error. Select at least one entry.
ErrorProductWithRefNotExist=Product with reference '%s' don't exist
ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index e880dbdac8d..4f82ea72bca 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -91,6 +91,8 @@ ErrorModuleSetupNotComplete=La configuration du module semble incomplète. Aller
ErrorBadMask=Erreur sur le masque
ErrorBadMaskFailedToLocatePosOfSequence=Erreur, masque sans numéro de séquence
ErrorBadMaskBadRazMonth=Erreur, mauvais valeur de remise à zéro
+ErrorMaxNumberReachForThisMask=Valeur maximale atteinte pour ce masque
+ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
ErrorSelectAtLeastOne=Erreur. Sélectionnez au moins une entrée.
ErrorProductWithRefNotExist=La référence produit '%s' n'existe pas
ErrorDeleteNotPossibleLineIsConsolidated=Suppression impossible car l'enregistrement porte sur au moins une transaction bancaire rapprochée
| |