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

Fix: usage of custom dir for supplier invoices

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-07 18:21:22 +01:00
parent c4af9d4d02
commit d686c52b63
2 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/facture/modules_facture.php
View File

@ -135,7 +135,7 @@ abstract class ModeleNumRefFactures
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param Object $object Object invoice * @param Object $object Object invoice
* @param string $message message * @param string $message message
* @param string $modele Force le modele a utiliser ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description

69
htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
View File

@ -58,38 +58,69 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
* *
* @param DoliDB $db objet base de donnee * @param DoliDB $db objet base de donnee
* @param Object $object object supplier invoice * @param Object $object object supplier invoice
* @param string $model force le modele a utiliser ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs objet lang a utiliser pour traduction
* @return int 0 if KO, 1 if OK * @return int 0 if KO, 1 if OK
*/ */
function supplier_invoice_pdf_create($db, $object, $model, $outputlangs) function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs)
{ {
global $conf, $langs; global $conf, $user, $langs;
$langs->load("suppliers"); $langs->load("suppliers");
$dir = DOL_DOCUMENT_ROOT."/core/modules/supplier_invoice/pdf/"; $error=0;
// Increase limit for PDF build
$err=error_reporting();
error_reporting(0);
@set_time_limit(120);
error_reporting($err);
$dir = "/core/modules/supplier_invoice/";
$srctemplatepath='';
// Positionne modele sur le nom du modele de invoice fournisseur a utiliser // Positionne modele sur le nom du modele de invoice fournisseur a utiliser
if (! dol_strlen($model)) if (! dol_strlen($modele))
{ {
if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
{ {
$model = $conf->global->INVOICE_SUPPLIER_ADDON_PDF; $modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
} }
else else
{ {
$model = 'canelle'; $modele = 'canelle';
//print $langs->trans("Error")." ".$langs->trans("Error_INVOICE_SUPPLIER_ADDON_PDF_NotDefined");
//return 0;
} }
} }
// Charge le modele
$file = "pdf_".$model.".modules.php"; // If selected modele is a filename template (then $modele="modelname:filename")
if (file_exists($dir.$file)) $tmp=explode(':',$modele,2);
if (! empty($tmp[1]))
{
$modele=$tmp[0];
$srctemplatepath=$tmp[1];
}
// Search template file
$file=''; $classname=''; $filefound=0;
foreach(array('doc','pdf') as $prefix)
{ {
$classname = "pdf_".$model; $file = $prefix."_".$modele.".modules.php";
require_once($dir.$file);
// On verifie l'emplacement du modele
$file = dol_buildpath($dir.'pdf/'.$file); // TODO rename into doc/
if (file_exists($file))
{
$filefound=1;
$classname=$prefix.'_'.$modele;
break;
}
}
// Charge le modele
if ($filefound)
{
require_once($file);
$obj = new $classname($db,$object); $obj = new $classname($db,$object);
@ -103,6 +134,14 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
// we delete preview files // we delete preview files
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
dol_delete_preview($object); dol_delete_preview($object);
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($db);
$result=$interface->run_triggers('BILL_BUILDDOC',$object,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
return 1; return 1;
} }
else else
@ -115,7 +154,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
} }
else else
{ {
print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.$file); print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
return 0; return 0;
} }
} }