lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajout de fonctionnalites sur le modele de numrotation paramtrable "pluton" - toujours en phase de test !!

Browse Source
This commit is contained in:
Regis Houssin 2007-04-25 21:50:45 +00:00
parent 0551a5c16f
commit 1e765acaf9
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/includes/modules/facture/pluton/pluton.modules.php
View File

@ -143,6 +143,16 @@ function info()
$texte.= ' ('.$langs->trans('IsNotDefined').')<br>'; $texte.= ' ('.$langs->trans('IsNotDefined').')<br>';
} }
$texte.= 'La numérotation des avoirs s\'incrémente avec les factures';
if ($conf->global->AVOIR_NUM_WITH_INVOICE)
{
$texte.= ' ('.$langs->trans('DefinedAndHasThisValue').' : '.$conf->global->AVOIR_NUM_WITH_INVOICE.')<br>';
}
else
{
$texte.= ' ('.$langs->trans('IsNotDefined').')<br>';
}
return $texte; return $texte;
} }
@ -206,7 +216,15 @@ function info()
} }
else if ($facture->type == 2) else if ($facture->type == 2)
{ {
$prefix=$this->prefixcreditnote; // Les avoirs peuvent suivre la numérotation des factures
if ($conf->global->AVOIR_NUM_WITH_INVOICE)
{
$prefix = $this->prefixinvoice;
}
else
{
$prefix=$this->prefixcreditnote;
}
} }
else else
{ {
@ -235,26 +253,26 @@ function info()
{ {
$yy = substr(strftime("%Y",time()),$numbityear); $yy = substr(strftime("%Y",time()),$numbityear);
} }
// On récupère la valeur max (réponse immédiate car champ indéxé) // On récupère la valeur max (réponse immédiate car champ indéxé)
$numQuantify = ($conf->global->FACTURE_NUM_QUANTIFY_METER - 1); $numQuantify = ($conf->global->FACTURE_NUM_QUANTIFY_METER - 1);
$fisc=$prefix.$yy; $fisc=$prefix.$yy;
$fayy=''; $fayy='';
$sql = "SELECT MAX(facnumber)"; $sql = "SELECT MAX(facnumber)";
$sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " FROM ".MAIN_DB_PREFIX."facture";
if ($conf->global->FACTURE_NUM_RESTART_BEGIN_YEAR == 1) $sql.= " WHERE facnumber like '${fisc}%'"; $sql.= " WHERE facnumber like '${prefix}%'";
if ($conf->global->FACTURE_NUM_RESTART_BEGIN_YEAR == 1) $sql.= " AND facnumber like '${fisc}%'";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$row = $db->fetch_row($resql); $row = $db->fetch_row($resql);
if ($row) $fayy = substr($row[0],0,$numQuantify); if ($row) $fayy = substr($row[0],0,$numQuantify);
} }
// Si au moins un champ respectant le modèle a été trouvée // Si au moins un champ respectant le modèle a été trouvée
if (eregi('FA[0-9][0-9]',$fayy)) if (eregi('^'.$prefix.'[0-9][0-9]',$fayy))
{ {
// Recherche rapide car restreint par un like sur champ indexé // Recherche rapide car restreint par un like sur champ indexé
$date = strftime("%Y%m", time());
$posindice = $conf->global->FACTURE_NUM_QUANTIFY_METER; $posindice = $conf->global->FACTURE_NUM_QUANTIFY_METER;
$sql = "SELECT MAX(0+SUBSTRING(facnumber,$posindice))"; $sql = "SELECT MAX(0+SUBSTRING(facnumber,$posindice))";
$sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " FROM ".MAIN_DB_PREFIX."facture";
@ -271,10 +289,16 @@ function info()
$max=0; $max=0;
} }
// On replace le prefix de l'avoir
if ($conf->global->AVOIR_NUM_WITH_INVOICE && $facture->type == 2)
{
$prefix = $this->prefixcreditnote;
}
$arg = '%0'.$conf->global->FACTURE_NUM_QUANTIFY_METER.'s'; $arg = '%0'.$conf->global->FACTURE_NUM_QUANTIFY_METER.'s';
$num = sprintf($arg,$max+1); $num = sprintf($arg,$max+1);
dolibarr_syslog("mod_facture_pluton::getNextValue return ".$prefix.$yy.$num);
return "$prefix$yy$num"; return $prefix.$yy.$num;
} }