diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 1b84ccd8ea9..6af33b8feae 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * * This program is free software; you can redistribute it and/or modify @@ -150,21 +150,25 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 global $conf,$langs; $langs->load("orders"); - $dir = DOL_DOCUMENT_ROOT."/includes/modules/commande/"; + $dir = "/includes/modules/commande/"; $srctemplatepath=''; $modelisok=0; $liste=array(); // Positionne modele sur le nom du modele de commande a utiliser $file = "pdf_".$modele.".modules.php"; - if ($modele && file_exists($dir.$file)) $modelisok=1; + // On verifie l'emplacement du modele + $file = dol_buildpath($dir.$file); + if ($modele && file_exists($file)) $modelisok=1; // Si model pas encore bon if (! $modelisok) { if ($conf->global->COMMANDE_ADDON_PDF) $modele = $conf->global->COMMANDE_ADDON_PDF; $file = "pdf_".$modele.".modules.php"; - if (file_exists($dir.$file)) $modelisok=1; + // On verifie l'emplacement du modele + $file = dol_buildpath($dir.$file); + if (file_exists($file)) $modelisok=1; } // Si model pas encore bon @@ -174,14 +178,16 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 $liste=$model->liste_modeles($db); $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau $file = "pdf_".$modele.".modules.php"; - if (file_exists($dir.$file)) $modelisok=1; + // On verifie l'emplacement du modele + $file = dol_buildpath($dir.$file); + if (file_exists($file)) $modelisok=1; } // Charge le modele if ($modelisok) { $classname = "pdf_".$modele; - require_once($dir.$file); + require_once($file); $obj = new $classname($db); diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index c34865f4136..b6ac0cb39b2 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by