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

bugfix

Browse Source
This commit is contained in:
Andre Cianfarani 2006-02-21 15:14:00 +00:00
parent e56186a9f6
commit f0c9230b45
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/facture.class.php
View File

@ -190,14 +190,9 @@ class Facture
$tva_tx=$prod->tva_tx; $tva_tx=$prod->tva_tx;
// multiprix // multiprix
if($conf->global->PRODUIT_MULTIPRICES == 1) if($conf->global->PRODUIT_MULTIPRICES == 1)
{
$price = $prod->multiprices[$soc->price_level]; $price = $prod->multiprices[$soc->price_level];
}
else else
{
$price = $prod->price; $price = $prod->price;
}
$resql = $this->addline( $resql = $this->addline(
$this->id, $this->id,
@ -1030,8 +1025,7 @@ class Facture
$soc->fetch($this->socidp); $soc->fetch($this->socidp);
if($soc->tva_assuj == "0") if($soc->tva_assuj == "0")
$txtva ="0"; $txtva ="0";
else dolibarr_syslog("facture.class.php:: txtva : ".$txtva);
$txtva=$prod->tva_tx;
if ($fk_product && ! $pu) if ($fk_product && ! $pu)
{ {
$prod = new Product($this->db, $fk_product); $prod = new Product($this->db, $fk_product);
@ -1041,7 +1035,11 @@ class Facture
if($conf->global->PRODUIT_MULTIPRICES == 1) if($conf->global->PRODUIT_MULTIPRICES == 1)
$pu = $prod->multiprices[$soc->price_level]; $pu = $prod->multiprices[$soc->price_level];
else else
{
$pu=$prod->price; $pu=$prod->price;
}
if($txtva == "")
$txtva=$prod->tva_tx;
} }
$price = $pu; $price = $pu;
$subprice = $pu; $subprice = $pu;