Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Removed warning

Browse Source
This commit is contained in:
Laurent Destailleur
2012-03-01 09:24:45 +01:00
parent 6aa7e90834
commit 9174182a27
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/commande/modules_commande.php
View File

@@ -183,7 +183,8 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
// Search template files // Search template files
$file=''; $classname=''; $filefound=0; $file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->modules_parts['models']); $dirmodels=array('/');
if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
foreach($dirmodels as $reldir) foreach($dirmodels as $reldir)
{ {
foreach(array('doc','pdf') as $prefix) foreach(array('doc','pdf') as $prefix)

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

@@ -181,7 +181,8 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
// Search template files // Search template files
$file=''; $classname=''; $filefound=0; $file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->modules_parts['models']); $dirmodels=array('/');
if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
foreach($dirmodels as $reldir) foreach($dirmodels as $reldir)
{ {
foreach(array('doc','pdf') as $prefix) foreach(array('doc','pdf') as $prefix)

3
htdocs/core/modules/propale/modules_propale.php
View File

@@ -184,7 +184,8 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
// Search template files // Search template files
$file=''; $classname=''; $filefound=0; $file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->modules_parts['models']); $dirmodels=array('/');
if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
foreach($dirmodels as $reldir) foreach($dirmodels as $reldir)
{ {
foreach(array('doc','pdf') as $prefix) foreach(array('doc','pdf') as $prefix)

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

@@ -70,13 +70,13 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs)
$langs->load("suppliers"); $langs->load("suppliers");
$error=0; $error=0;
// Increase limit for PDF build // Increase limit for PDF build
$err=error_reporting(); $err=error_reporting();
error_reporting(0); error_reporting(0);
@set_time_limit(120); @set_time_limit(120);
error_reporting($err); error_reporting($err);
$srctemplatepath=''; $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
@@ -91,7 +91,7 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs)
$modele = 'canelle'; $modele = 'canelle';
} }
} }
// If selected modele is a filename template (then $modele="modelname:filename") // If selected modele is a filename template (then $modele="modelname:filename")
$tmp=explode(':',$modele,2); $tmp=explode(':',$modele,2);
if (! empty($tmp[1])) if (! empty($tmp[1]))
@@ -99,16 +99,17 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs)
$modele=$tmp[0]; $modele=$tmp[0];
$srctemplatepath=$tmp[1]; $srctemplatepath=$tmp[1];
} }
// Search template file // Search template file
$file=''; $classname=''; $filefound=0; $file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->modules_parts['models']); $dirmodels=array('/');
if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
foreach($dirmodels as $reldir) foreach($dirmodels as $reldir)
{ {
foreach(array('doc','pdf') as $prefix) foreach(array('doc','pdf') as $prefix)
{ {
$file = $prefix."_".$modele.".modules.php"; $file = $prefix."_".$modele.".modules.php";
// On verifie l'emplacement du modele // On verifie l'emplacement du modele
$file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/".$file,0); $file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/".$file,0);
if (file_exists($file)) if (file_exists($file))
@@ -138,14 +139,14 @@ function supplier_invoice_pdf_create($db, $object, $modele, $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 // Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($db); $interface=new Interfaces($db);
$result=$interface->run_triggers('BILL_BUILDDOC',$object,$user,$langs,$conf); $result=$interface->run_triggers('BILL_BUILDDOC',$object,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers
return 1; return 1;
} }
else else

19
htdocs/core/modules/supplier_order/modules_commandefournisseur.php
View File

@@ -42,7 +42,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
/** /**
* Return list of active generation modules * Return list of active generation modules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function liste_modeles($db) function liste_modeles($db)
@@ -153,17 +153,17 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
{ {
global $conf,$langs; global $conf,$langs;
$langs->load("suppliers"); $langs->load("suppliers");
$error=0; $error=0;
// Increase limit for PDF build // Increase limit for PDF build
$err=error_reporting(); $err=error_reporting();
error_reporting(0); error_reporting(0);
@set_time_limit(120); @set_time_limit(120);
error_reporting($err); error_reporting($err);
$srctemplatepath=''; $srctemplatepath='';
// Positionne le modele sur le nom du modele a utiliser // Positionne le modele sur le nom du modele a utiliser
if (! dol_strlen($modele)) if (! dol_strlen($modele))
{ {
@@ -176,7 +176,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
$modele = 'muscadet'; $modele = 'muscadet';
} }
} }
// If selected modele is a filename template (then $modele="modelname:filename") // If selected modele is a filename template (then $modele="modelname:filename")
$tmp=explode(':',$modele,2); $tmp=explode(':',$modele,2);
if (! empty($tmp[1])) if (! empty($tmp[1]))
@@ -184,16 +184,17 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
$modele=$tmp[0]; $modele=$tmp[0];
$srctemplatepath=$tmp[1]; $srctemplatepath=$tmp[1];
} }
// Search template files // Search template files
$file=''; $classname=''; $filefound=0; $file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->modules_parts['models']); $dirmodels=array('/');
if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
foreach($dirmodels as $reldir) foreach($dirmodels as $reldir)
{ {
foreach(array('doc','pdf') as $prefix) foreach(array('doc','pdf') as $prefix)
{ {
$file = $prefix."_".$modele.".modules.php"; $file = $prefix."_".$modele.".modules.php";
// On verifie l'emplacement du modele // On verifie l'emplacement du modele
$file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0); $file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0);
if (file_exists($file)) if (file_exists($file))