mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-08 00:52:01 +01:00
Fix: le compteur n'tait pas remis zro en dbut d'anne fiscale
This commit is contained in:
@@ -86,22 +86,38 @@ class mod_commande_emeraude extends ModeleNumRefCommandes
|
||||
function getNextValue()
|
||||
{
|
||||
global $db,$conf;
|
||||
|
||||
// D'abord on r<EFBFBD>cup<EFBFBD>re la valeur max (r<>ponse imm<6D>diate car champ ind<6E>x<EFBFBD>)
|
||||
|
||||
// D'abord on d<EFBFBD>fini l'ann<6E>e fiscale
|
||||
$prefix='C';
|
||||
$current_month = date("n");
|
||||
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
|
||||
{
|
||||
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
|
||||
}
|
||||
else
|
||||
{
|
||||
$yy = strftime("%y",time());
|
||||
}
|
||||
|
||||
// On r<>cup<75>re la valeur max (r<>ponse imm<6D>diate car champ ind<6E>x<EFBFBD>)
|
||||
$fisc=$prefix.$yy;
|
||||
$cyy='';
|
||||
$sql = "SELECT MAX(ref)";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."commande";
|
||||
$sql.= " WHERE ref like '${fisc}%'";
|
||||
$resql=$db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$row = $db->fetch_row($resql);
|
||||
if ($row) $cyy = substr($row[0],0,3);
|
||||
}
|
||||
|
||||
|
||||
// Si au moins un champ respectant le mod<6F>le a <20>t<EFBFBD> trouv<75>e
|
||||
if (eregi('C[0-9][0-9]',$cyy))
|
||||
{
|
||||
// Recherche rapide car restreint par un like sur champ index<65>
|
||||
$prefix='C';
|
||||
$date = strftime("%Y%m", time());
|
||||
$posindice=4;
|
||||
$sql = "SELECT MAX(0+SUBSTRING(ref,$posindice))";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."commande";
|
||||
@@ -118,16 +134,6 @@ class mod_commande_emeraude extends ModeleNumRefCommandes
|
||||
$max=0;
|
||||
}
|
||||
|
||||
$current_month = date("n");
|
||||
if($conf->global->SOCIETE_FISCAL_MONTH_START && $current_month >= $conf->global->SOCIETE_FISCAL_MONTH_START)
|
||||
{
|
||||
$yy = strftime("%y",mktime(0,0,0,date("m"),date("d"),date("Y")+1));
|
||||
}
|
||||
else
|
||||
{
|
||||
$yy = strftime("%y",time());
|
||||
}
|
||||
|
||||
$num = sprintf("%05s",$max+1);
|
||||
|
||||
return "C$yy$num";
|
||||
|
||||
Reference in New Issue
Block a user