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

Fix: Use wrong value of constant if multientity is used.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-12-09 19:45:15 +00:00
parent 9fc276d03b
commit f7c9d6be62
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/includes/modules/livraison/modules_livraison.php
View File

@ -169,7 +169,7 @@ class ModeleNumRefDeliveryOrder
*/ */
function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs='') function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs='')
{ {
global $langs; global $conf,$langs;
$langs->load("deliveries"); $langs->load("deliveries");
$dir = DOL_DOCUMENT_ROOT."/includes/modules/livraison/pdf/"; $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 // Positionne modele sur le nom du modele de bon de livraison a utiliser
if (! strlen($modele)) 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 else
{ {

2
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -370,7 +370,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetXY($this->marge_gauche,$posy); $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->SetTextColor(0,0,200);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',12);

2
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -349,7 +349,7 @@ class pdf_propale_jaune extends ModelePDFPropales
pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur);
//Affiche le filigrane brouillon - Print Draft Watermark //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_angle=deg2rad(55);
$watermark_x=5; $watermark_x=5;