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

Uniformisation des constantes

Browse Source
This commit is contained in:
Regis Houssin 2006-07-24 11:48:41 +00:00
parent 84727aa0ad
commit 8578bc8f35
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -1033,7 +1033,7 @@ if ($_GET['propalid'] > 0)
else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a>';
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 '<br>'.nl2br($objp->product_desc);
}

2
htdocs/commande/fiche.php
View File

@ -1252,7 +1252,7 @@ else
else print img_object($langs->trans('ShowProduct'),'product');
print ' '.$objp->ref.'</a> - '.nl2br($objp->product);
print ($objp->description && $objp->description!=$objp->product)?'<br>'.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 '<br>'.nl2br($objp->product_desc);
}

2
htdocs/compta/facture.php
View File

@ -1794,7 +1794,7 @@ else
print_date_range($objp->date_start,$objp->date_end);
print ($objp->description && $objp->description!=$objp->product)?'<br>'.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 '<br>'.nl2br(stripslashes($objp->product_desc));
}

2
htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php
View File

@ -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)
{

2
htdocs/includes/modules/modCommande.class.php
View File

@ -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";

2
htdocs/includes/modules/modFacture.class.php
View File

@ -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";

2
htdocs/includes/modules/modPropale.class.php
View File

@ -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";