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

Fix: clause with entity

Browse Source
This commit is contained in:
Regis Houssin 2009-05-26 12:39:24 +00:00
parent d70beb872c
commit daab595b57
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
View File

@ -41,7 +41,7 @@ class ModelePdfExpedition extends FPDF
/** /**
\brief Renvoi le dernier message d'erreur de cr<EFBFBD>ation de PDF de commande \brief Renvoi le dernier message d'erreur de creation de PDF de commande
*/ */
function pdferror() function pdferror()
{ {
@ -55,30 +55,33 @@ class ModelePdfExpedition extends FPDF
*/ */
function liste_modeles($db) function liste_modeles($db)
{ {
$type='shipping'; global $conf;
$liste=array();
$sql ="SELECT nom as id, nom as lib";
$sql.=" FROM ".MAIN_DB_PREFIX."document_model";
$sql.=" WHERE type = '".$type."'";
$resql = $db->query($sql); $type='shipping';
if ($resql) $liste=array();
$sql ="SELECT nom as id, nom as lib";
$sql.=" FROM ".MAIN_DB_PREFIX."document_model";
$sql.=" WHERE type = '".$type."'";
$sql.= " AND entity = ".$conf->entity;
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num)
{ {
$num = $db->num_rows($resql); $row = $db->fetch_row($resql);
$i = 0; $liste[$row[0]]=$row[1];
while ($i < $num) $i++;
{
$row = $db->fetch_row($resql);
$liste[$row[0]]=$row[1];
$i++;
}
} }
else }
{ else
$this->error=$db->error(); {
return -1; $this->error=$db->error();
} return -1;
return $liste; }
return $liste;
} }
} }
@ -117,7 +120,7 @@ function expedition_pdf_create($db, $id, $modele, $outputlangs)
$liste=array(); $liste=array();
$model=new ModelePDFExpedition(); $model=new ModelePDFExpedition();
$liste=$model->liste_modeles($db); $liste=$model->liste_modeles($db);
$modele=key($liste); // Renvoie premiere valeur de cl<EFBFBD> trouv<75> dans le tableau $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau
$file = "pdf_expedition_".$modele.".modules.php"; $file = "pdf_expedition_".$modele.".modules.php";
if (file_exists($dir.$file)) $modelisok=1; if (file_exists($dir.$file)) $modelisok=1;
} }