From 9065ff184bce9c804e25677f91dfa02d96749b7c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Jul 2006 11:55:03 +0000 Subject: [PATCH] Uniformisation des constantes --- htdocs/comm/propal.php | 2 +- htdocs/includes/modules/modPropale.class.php | 2 +- htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 45119da593e..78341805047 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1033,7 +1033,7 @@ if ($_GET['propalid'] > 0) else print img_object($langs->trans('ShowProduct'),'product'); print ' '.$objp->ref.''; print ' - '.nl2br($objp->product); - if ($conf->global->PROPAL_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($conf->global->PROPALE_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) { print '
'.nl2br($objp->product_desc); } diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php index 03a58c53012..3dc11e1e375 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/htdocs/includes/modules/modPropale.class.php @@ -84,7 +84,7 @@ class modPropale extends DolibarrModules $this->const[1][3] = 'Nom du gestionnaire de numérotation des propales'; $this->const[1][4] = 0; - $this->const[2][0] = "PROPAL_ADD_PROD_DESC"; + $this->const[2][0] = "PROPALE_ADD_PROD_DESC"; $this->const[2][1] = "chaine"; $this->const[2][2] = "0"; $this->const[2][3] = "Mettre à 1 pour voir la description d\'un produit dans une propale"; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 1c72a40b6d5..a0ab52e4402 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -238,7 +238,7 @@ class pdf_propale_azur extends ModelePDFPropales } // Ajoute description complète du produit - if ($conf->global->PROPAL_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($conf->global->PROPALE_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) { if ($propale->lignes[$i]->product_desc && $propale->lignes[$i]->product_desc!=$propale->lignes[$i]->libelle && $propale->lignes[$i]->product_desc!=$propale->lignes[$i]->desc) {