From 8578bc8f3592e3ddba66ee18afa4869ab29592fb Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 24 Jul 2006 11:48:41 +0000 Subject: [PATCH] Uniformisation des constantes --- htdocs/comm/propal.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php | 2 +- htdocs/includes/modules/modCommande.class.php | 2 +- htdocs/includes/modules/modFacture.class.php | 2 +- htdocs/includes/modules/modPropale.class.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 69d8a67adf8..45119da593e 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->PROP_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($conf->global->PROPAL_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) { print '
'.nl2br($objp->product_desc); } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index b56bbed3b1d..07657d7a382 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1252,7 +1252,7 @@ else else print img_object($langs->trans('ShowProduct'),'product'); print ' '.$objp->ref.' - '.nl2br($objp->product); print ($objp->description && $objp->description!=$objp->product)?'
'.nl2br($objp->description):''; - if ($conf->global->COM_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($conf->global->COMMANDE_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) { print '
'.nl2br($objp->product_desc); } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 8885dfb353a..a843bcb9c9f 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1794,7 +1794,7 @@ else print_date_range($objp->date_start,$objp->date_end); print ($objp->description && $objp->description!=$objp->product)?'
'.stripslashes(nl2br($objp->description)):''; - if ($conf->global->FAC_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($conf->global->FACTURE_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) { print '
'.nl2br(stripslashes($objp->product_desc)); } diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index 2c3b1e5f629..1bb34496258 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -218,7 +218,7 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers } // Ajoute description du produit - if ($conf->global->COM_ADD_PROD_DESC && !$conf->global->PRODUIT_CHANGE_PROD_DESC) + if ($conf->global->COMMANDE_ADD_PROD_DESC && !$conf->global->PRODUIT_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/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index 18433fc9081..42a35a1b19b 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/includes/modules/modCommande.class.php @@ -85,7 +85,7 @@ class modCommande extends DolibarrModules $this->const[1][3] = 'Nom du gestionnaire de numérotation des commandes'; $this->const[1][4] = 0; - $this->const[2][0] = "COM_ADD_PROD_DESC"; + $this->const[2][0] = "COMMANDE_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 commande"; diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 5f1d5ac7866..155b4fd859e 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -94,7 +94,7 @@ class modFacture extends DolibarrModules $this->const[$r][2] = "0"; $r++; - $this->const[$r][0] = "FAC_ADD_PROD_DESC"; + $this->const[$r][0] = "FACTURE_ADD_PROD_DESC"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "0"; $this->const[$r][3] = "Mettre à 1 pour voir la description d'un produit dans une facture"; diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php index 3dce3e0ad65..03a58c53012 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] = "PROP_ADD_PROD_DESC"; + $this->const[2][0] = "PROPAL_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";