From e8e91e4823933529bc70974d917adec5c1dd0c84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Nov 2011 02:04:29 +0100
Subject: [PATCH] Fix: POS use HT even when multiprice enabled.

---
 htdocs/cashdesk/class/Facturation.class.php |  7 +++----
 htdocs/cashdesk/facturation_verif.php       |  3 ++-
 htdocs/cashdesk/validation_verif.php        | 22 ++++++++++++++-------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 9f2ea75cc00..5a7e6b94871 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -144,15 +144,14 @@ class Facturation {
         $newcartarray[$i]['price']=$product->price;
         $newcartarray[$i]['price_ttc']=$product->price_ttc;
 
-        /** add Ditto for MultiPrix*/
         if ($conf->global->PRODUIT_MULTIPRICES)
         {
-            if(isset($product->multiprices[$societe->price_level]))
+            if (isset($product->multiprices[$societe->price_level]))
             {
-                $newcartarray[$i]['price'] = $product->multiprices_ttc[$societe->price_level];
+                $newcartarray[$i]['price'] = $product->multiprices[$societe->price_level];
+                $newcartarray[$i]['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
             }
         }
-        /** end add Ditto */
 
         $newcartarray[$i]['fk_article']=$this->id;
         $newcartarray[$i]['qte']=$this->qte();
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index f4b8398cea2..2944d86b622 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -77,7 +77,8 @@ switch ( $_GET['action'] )
 
 						if(isset($product->multiprices[$societe->price_level]))
 						{
-							$ret['price'] = $product->multiprices_ttc[$societe->price_level];
+							$ret['price'] = $product->multiprices[$societe->price_level];
+							$ret['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
 							// $product->multiprices_min[$societe->price_level];
 							// $product->multiprices_min_ttc[$societe->price_level];
 							// $product->multiprices_base_type[$societe->price_level];
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index c7b028831b7..41d83303cb8 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -142,6 +142,10 @@ switch ($action)
 		$user->fetch($_SESSION['uid']);
 		$user->getrights();
 
+		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
+		$societe = new Societe($db);
+		$societe->fetch($thirdpartyid);
+		
 		$invoice=new Facture($db);
 
 		// Get content of cart
@@ -152,13 +156,17 @@ switch ($action)
 		for ($i=0;$i < $tab_liste_size;$i++)
 		{
 			// Recuperation de l'article
-			$res = $db->query('SELECT label, tva_tx, price FROM '.MAIN_DB_PREFIX.'product WHERE rowid = '.$tab_liste[$i]['fk_article']);
-			$ret=array();
-			$tab = $db->fetch_array($res);
-			foreach ( $tab as $cle => $valeur )
-			{
-				$ret[$cle] = $valeur;
-			}
+			$product = new Product($db);
+			$product->fetch($tab_liste[$i]['fk_article']);
+			$ret=array('label'=>$product->label,'tva_tx'=>$product->tva_tx,'price'=>$product->price);
+
+	        if ($conf->global->PRODUIT_MULTIPRICES)
+	        {
+	            if (isset($product->multiprices[$societe->price_level]))
+	            {
+	                $ret['price'] = $product->multiprices[$societe->price_level];
+	            }
+	        }
 			$tab_article = $ret;
 
 			$res = $db->query('SELECT taux FROM '.MAIN_DB_PREFIX.'c_tva WHERE rowid = '.$tab_liste[$i]['fk_tva']);