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

Fix: la description produit tait rcupre alors que l'option n'tait pas active

Browse Source
This commit is contained in:
Regis Houssin 2006-09-11 20:26:15 +00:00
parent bd2d606e94
commit 6a7ba4ca5e
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/propal.class.php
View File

@ -144,23 +144,39 @@ class Propal extends CommonObject
$prod=new Product($this->db); $prod=new Product($this->db);
$prod->fetch($idproduct); $prod->fetch($idproduct);
// on ajoute la description du produit si l'option est active
if ($conf->global->PRODUIT_CHANGE_PROD_DESC)
{
$productdesc = $prod->description;
}
else
{
$productdesc = '';
}
$tva_tx = get_default_tva($mysoc,$this->client,$prod->tva_tx); $tva_tx = get_default_tva($mysoc,$this->client,$prod->tva_tx);
// multiprix // multiprix
if($conf->global->PRODUIT_MULTIPRICES == 1) if($conf->global->PRODUIT_MULTIPRICES == 1)
{
$price = $prod->multiprices[$this->client->price_level]; $price = $prod->multiprices[$this->client->price_level];
}
else else
{
$price = $prod->price; $price = $prod->price;
}
$line = new PropaleLigne($this->db);
$line=new PropaleLigne($this->db);
$line->rowid = $idproduct; $line->rowid = $idproduct;
$line->fk_product=$idproduct; $line->fk_product = $idproduct;
$line->desc=$prod->description; $line->desc = $productdesc;
$line->qty = $qty; $line->qty = $qty;
$line->subprice=$price; $line->subprice = $price;
$line->remise_percent = $remise_percent; $line->remise_percent = $remise_percent;
$line->tva_tx=$tva_tx; $line->tva_tx = $tva_tx;
$this->products[]=$line; $this->products[] = $line;
} }
} }