From 5b8237ecf2a2433782b9c8b333cf4d9fe131e80d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 10 Aug 2010 01:19:22 +0000
Subject: [PATCH] Fix: default vat

---
 .../fourn/class/fournisseur.product.class.php | 40 +++++++++++--------
 htdocs/product/fournisseurs.php               |  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 9836594f38f..0d6ef6ac5fa 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -272,23 +272,28 @@ class ProductFournisseur extends Product
 			$sql.= " AND quantity = ".$qty;
 		}
 
-		if ($this->db->query($sql))
+		$resql=$this->db->query($sql);
+		if ($resql)
 		{
 			if ($price_base_type == 'TTC')
 			{
-				$ttx = get_default_tva($fourn,$mysoc,($this->tva_tx?$this->tva_tx:0));
+				$ttx = get_default_tva($fourn,$mysoc,$this->id);
 				$buyprice = $buyprice/(1+($ttx/100));
 			}
 			$unitBuyPrice = price2num($buyprice/$qty,'MU');
 
+			$now=dol_now();
+
 			// Ajoute prix courant du fournisseur pour cette quantite
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price";
-			$sql.= " SET datec = ".$this->db->idate(mktime());
-			$sql.= " ,fk_product_fournisseur = ".$this->product_fourn_id;
-			$sql.= " ,fk_user = ".$user->id;
-			$sql.= " ,price = ".price2num($buyprice);
-			$sql.= " ,quantity = ".$qty;
-			$sql.= " ,unitprice = ".$unitBuyPrice;
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
+			$sql.= "datec, fk_product_fournisseur, fk_user, price, quantity, unitprice)";
+			$sql.= " values('".$this->db->idate($now)."',";
+			$sql.= " ".$this->product_fourn_id.",";
+			$sql.= " ".$user->id.",";
+			$sql.= " ".price2num($buyprice).",";
+			$sql.= " ".$qty.",";
+			$sql.= " ".$unitBuyPrice;
+            $sql.=")";
 
 			dol_syslog("ProductFournisseur::update_buyprice sql=".$sql);
 			if (! $this->db->query($sql))
@@ -299,14 +304,17 @@ class ProductFournisseur extends Product
 			if (! $error)
 			{
 				// Ajoute modif dans table log
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log ";
-				$sql .= " SET datec = ".$this->db->idate(mktime());
-				$sql .= " ,fk_product_fournisseur = ".$this->product_fourn_id;
-				$sql .= " ,fk_user = ".$user->id;
-				$sql .= " ,price = ".price2num($buyprice);
-				$sql .= " ,quantity = ".$qty;
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
+				$sql.= "datec, fk_product_fournisseur,fk_user,price,quantity)";
+				$sql.= "values('".$this->db->idate($now)."',";
+				$sql.= " ".$this->product_fourn_id.",";
+				$sql.= " ".$user->id.",";
+				$sql.= " ".price2num($buyprice).",";
+				$sql.= " ".$qty;
+                $sql.=")";
 
-				if (! $this->db->query($sql))
+				$resql=$this->db->query($sql);
+				if (! $resql)
 				{
 					$error++;
 				}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 48a82efcb7e..7e921a8c9d0 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -295,7 +295,7 @@ if ($_GET["id"] || $_GET["ref"])
 				print '<td><input class="flat" name="price" size="8" value="'.($_POST["price"]?$_POST["price"]:price($product->fourn_price)).'">';
 				print '&nbsp;';
 				print $html->select_PriceBaseType(($_POST["price_base_type"]?$_POST["price_base_type"]:$product->price_base_type), "price_base_type");
-				print '</td>';
+                print '</td>';
 				print '</tr>';
 
 				print '<tr><td colspan="4" align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">';