diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 0fc6d6693e1..56d88d35a35 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -1026,24 +1026,20 @@ class Facture $qty=price2num($qty); if (! $qty) $qty=1; if (! $ventil) $ventil=0; - + $soc = new Societe($this->db); + $soc->fetch($this->socidp); + if($soc->tva_assuj == "0") + $txtva ="0"; + else + $txtva=$prod->tva_tx; if ($fk_product && ! $pu) { $prod = new Product($this->db, $fk_product); $prod->fetch($fk_product); $product_desc = $prod->description; - $soc = new Societe($this->db); - $soc->fetch($this->socidp); - if($soc->tva_assuj == "0") - $txtva ="0"; - else - $txtva=$prod->tva_tx; // multiprix if($conf->global->PRODUIT_MULTIPRICES == 1) - { - $pu = $prod->multiprices[$soc->price_level]; - } else $pu=$prod->price; } diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index b2c9ca9c144..6726ef25d62 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -256,7 +256,7 @@ if ($_POST["action"] == 'addinfacture' && $user->rights->facture->creer) $facture->addline($_POST["factureid"], addslashes($product->libelle), addslashes($product->description), - $product->price, + "", // volontairement laissé vide pour fonctionnement module multiprix $_POST["qty"], $product->tva_tx, $product->id,