From 5004d52a777c1faccb5c4d5af35fd2eff702a6e2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 12 Feb 2006 13:28:14 +0000
Subject: [PATCH] modification de la description produit

---
 htdocs/includes/modules/commande/pdf_azur.modules.php        | 2 +-
 htdocs/includes/modules/facture/pdf_crabe.modules.php        | 2 +-
 htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/modules/commande/pdf_azur.modules.php b/htdocs/includes/modules/commande/pdf_azur.modules.php
index d22aaacf64e..9888a318b31 100644
--- a/htdocs/includes/modules/commande/pdf_azur.modules.php
+++ b/htdocs/includes/modules/commande/pdf_azur.modules.php
@@ -219,7 +219,7 @@ class pdf_azur extends ModelePDFCommandes
                         }
 
                         // Ajoute description du produit
-                        if ($conf->global->COM_ADD_PROD_DESC)
+                        if ($conf->global->COM_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
                         {
                             if ($com->lignes[$i]->product_desc&&$com->lignes[$i]->product_desc!=$fac->lignes[$i]->libelle&&$com->lignes[$i]->product_desc!=$com->lignes[$i]->desc)
                             {
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 44563d80f34..72ab94c8b51 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -207,7 +207,7 @@ class pdf_crabe extends ModelePDFFactures
                         }
 
                         // Ajoute description du produit
-                        if ($conf->global->FAC_ADD_PROD_DESC)
+                        if ($conf->global->FAC_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
                         {
                             if ($fac->lignes[$i]->product_desc&&$fac->lignes[$i]->product_desc!=$fac->lignes[$i]->libelle&&$fac->lignes[$i]->product_desc!=$fac->lignes[$i]->desc)
                             {
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index dbad6f08db8..3dd160357be 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -216,7 +216,7 @@ class pdf_propale_azur extends ModelePDFPropales
                         }
 
                         // Ajoute description du produit
-                        if ($conf->global->PROP_ADD_PROD_DESC)
+                        if ($conf->global->PROP_ADD_PROD_DESC && !$conf->global->CHANGE_PROD_DESC)
                         {
                             if ($prop->lignes[$i]->product_desc&&$prop->lignes[$i]->product_desc!=$fac->lignes[$i]->libelle&&$prop->lignes[$i]->product_desc!=$prop->lignes[$i]->desc)
                             {