Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

la constante PRODUIT_CHANGE_PROD_DESC n'a plus d'intrt si on rajoute la description

Browse Source 
produit par dfaut ???
This commit is contained in:
Regis Houssin
2006-06-16 13:10:45 +00:00
parent 41f996f80d
commit 02b9508f07
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/compta/facture.php
View File

@@ -403,19 +403,32 @@ if (($_POST['action'] == 'addligne' || $_POST['action'] == 'addligne_predef') &&
{
$prod = new Product($db, $_POST['idprod']);
$prod->fetch($_POST['idprod']);
// multiprix
if ($conf->global->PRODUIT_MULTIPRICES == 1)
{
$pu = $prod->multiprices[$soc->price_level];
}
else
{
// multiprix
if ($conf->global->PRODUIT_MULTIPRICES == 1)
{
$pu = $prod->multiprices[$soc->price_level];
}
else
{
$pu=$prod->price;
}
$desc=$_POST['desc'];
if (! $desc) $desc = $prod->description;
if ($conf->global->PRODUIT_CHANGE_PROD_DESC) $prod->description;
$tva_tx = get_default_tva($mysoc,$soc,$prod->tva_tx);
}
$desc=$_POST['desc'];
if (! $desc)
{
$desc = $prod->description;
}
// ceci n'a plus d'int<6E>r<EFBFBD>t si on rajoute la description produit
// <20> chaque fois ???
if ($conf->global->PRODUIT_CHANGE_PROD_DESC)
{
$desc = $prod->description;
}
$tva_tx = get_default_tva($mysoc,$soc,$prod->tva_tx);
}
else
{