From a96e8c17208592e0724b7e03d4db77bd1d946e8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 25 May 2006 17:03:00 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20le=20logo=20n'est=20pas=20d=E9finir?=
=?UTF-8?q?,=20on=20ne=20l'utilise=20pas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php | 2 +-
htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php | 2 +-
htdocs/includes/modules/facture/pdf_crabe.modules.php | 2 +-
htdocs/includes/modules/facture/pdf_huitre.modules.php | 4 ++--
htdocs/includes/modules/facture/pdf_oursin.modules.php | 2 +-
htdocs/includes/modules/fichinter/pdf_soleil.modules.php | 2 +-
htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 2 +-
htdocs/livraison/mods/pdf/pdf_typhon.modules.php | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
index 39dcc4cc08d..b3ea3ba6edf 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
@@ -229,7 +229,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//*********************LOGO****************************
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
index a25f1edb80e..f00e6f9ef0a 100644
--- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
+++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
@@ -643,7 +643,7 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 2a91368aee9..b28e6b576a5 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -761,7 +761,7 @@ class pdf_crabe extends ModelePDFFactures
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php
index 6c2cbdd7c70..2bfe55ade4d 100644
--- a/htdocs/includes/modules/facture/pdf_huitre.modules.php
+++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php
@@ -425,7 +425,7 @@ class pdf_huitre extends ModelePDFFactures {
*/
function _pagehead(&$pdf, $fac)
{
- global $langs,$conf;
+ global $langs,$conf,$mysoc;
$langs->load("main");
$langs->load("bills");
$langs->load("companies");
@@ -437,7 +437,7 @@ class pdf_huitre extends ModelePDFFactures {
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index 560a43284ed..6e85b000516 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -589,7 +589,7 @@ class pdf_oursin extends ModelePDFFactures
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index 37fd11a3acd..5507e81ba80 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -105,7 +105,7 @@ class pdf_soleil extends ModelePDFFicheinter
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 965d37676e4..47fead256a6 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -680,7 +680,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php
index 6d16ba0aa72..a14824e2191 100644
--- a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php
+++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php
@@ -641,7 +641,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Logo
$logo=$conf->societe->dir_logos.'/'.$mysoc->logo;
- if ($logo)
+ if ($mysoc->logo)
{
if (is_readable($logo))
{
--
GitLab