From 55351fd59bb329e6b9b126a66f548841c6b691d0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 30 Jul 2007 21:48:08 +0000
Subject: [PATCH] Fix: affichage des prix

---
 htdocs/product/barcode.php       | 13 +++++++++++--
 htdocs/product/stock/product.php | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index d343e7ea783..bb83ab3e790 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -71,8 +71,17 @@ print '</tr>';
 print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->libelle.'</td>';
 print '</tr>';
 
-// Prix
-print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="2">'.price($product->price).'</td></tr>';
+ // Prix
+    print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="2">';
+	if ($product->price_base_type == 'TTC')
+	{
+	  print price($product->price_ttc).' '.$langs->trans($product->price_base_type);
+	}
+	else
+	{
+	  print price($product->price).' '.$langs->trans($product->price_base_type);
+	}
+	print '</td></tr>';
 
 // Statut
 print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 2c9196b548f..9f0991af1c3 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -126,13 +126,21 @@ if ($_GET["id"] || $_GET["ref"])
         print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
         print '</tr>';
 
-        // Prix
-        print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>'.price($product->price).'</td>';
-        print '</tr>';
+         // Prix
+         print '<tr><td>'.$langs->trans("SellingPrice").'</td><td colspan="2">';
+         if ($product->price_base_type == 'TTC')
+         {
+         	 print price($product->price_ttc).' '.$langs->trans($product->price_base_type);
+         }
+         else
+         {
+         	 print price($product->price).' '.$langs->trans($product->price_base_type);
+         }
+         print '</td></tr>';
 
         // Statut
         print '<tr><td>'.$langs->trans("Status").'</td><td>';
-		print $product->getLibStatut(2);
+        print $product->getLibStatut(2);
         print '</td></tr>';
 
         // Stock