From f7c9d6be62638afd1089545e44b655760d033851 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Dec 2009 19:45:15 +0000
Subject: [PATCH] Fix: Use wrong value of constant if multientity is used.

---
 htdocs/includes/modules/livraison/modules_livraison.php     | 6 +++---
 .../includes/modules/livraison/pdf/pdf_sirocco.modules.php  | 2 +-
 .../includes/modules/propale/pdf_propale_jaune.modules.php  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php
index f94f03c4b4d..9ed0b6e9943 100644
--- a/htdocs/includes/modules/livraison/modules_livraison.php
+++ b/htdocs/includes/modules/livraison/modules_livraison.php
@@ -169,7 +169,7 @@ class ModeleNumRefDeliveryOrder
  */
 function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs='')
 {
-	global $langs;
+	global $conf,$langs;
 	$langs->load("deliveries");
 
 	$dir = DOL_DOCUMENT_ROOT."/includes/modules/livraison/pdf/";
@@ -177,9 +177,9 @@ function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs=''
 	// Positionne modele sur le nom du modele de bon de livraison a utiliser
 	if (! strlen($modele))
 	{
-		if (defined("LIVRAISON_ADDON_PDF") && LIVRAISON_ADDON_PDF)
+		if ($conf->global->LIVRAISON_ADDON_PDF)
 		{
-			$modele = LIVRAISON_ADDON_PDF;
+			$modele = $conf->global->LIVRAISON_ADDON_PDF;
 		}
 		else
 		{
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index d4b5683f492..2263db3575e 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -370,7 +370,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 
 		$pdf->SetXY($this->marge_gauche,$posy);
 
-		if (defined("MAIN_INFO_SOCIETE_NOM"))
+		if ($conf->global->MAIN_INFO_SOCIETE_NOM)
 		{
 			$pdf->SetTextColor(0,0,200);
 			$pdf->SetFont('Arial','B',12);
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index abd6337ff70..c3091ae925a 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -349,7 +349,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 		pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		if($object->statut==0 && defined("PROPALE_DRAFT_WATERMARK") )
+		if($object->statut==0 && ! empty($conf->global->PROPALE_DRAFT_WATERMARK))
 		{
 			$watermark_angle=deg2rad(55);
 			$watermark_x=5;