From 500d7379802ca33f42f2d54881cd3a5d7ad50cc1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2009 16:43:47 +0000 Subject: [PATCH] Fix: We must use conf->global instead of constant. If not and constant is defined twice (with 2 differents entity values), we use the wrong one. --- .../modules/supplier_order/modules_commandefournisseur.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index 2388eb0227b..c0af8f64ece 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -172,14 +172,14 @@ function supplier_order_pdf_create($db, $comid, $modele,$outputlangs) global $langs; $langs->load("suppliers"); - $dir = DOL_DOCUMENT_ROOT."//includes/modules/supplier_order/pdf/"; + $dir = DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/pdf/"; // Positionne modele sur le nom du modele de commande fournisseur a utiliser if (! strlen($modele)) { - if (defined("COMMANDE_SUPPLIER_ADDON_PDF") && COMMANDE_SUPPLIER_ADDON_PDF) + if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) { - $modele = COMMANDE_SUPPLIER_ADDON_PDF; + $modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF; } else {