From fc6d6fdcb7c9185223fbfa7497404ba569b05381 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 13 Nov 2007 20:59:12 +0000
Subject: [PATCH] Fix: Corrections divers sur affichage des produits et stocks

---
 htdocs/product/fiche.php         | 21 ++++++++++-----------
 htdocs/product/reassort.php      | 11 +++++------
 htdocs/product/stock/product.php | 25 +++++++++----------------
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 684a5e10b30..66209fded45 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -568,6 +568,8 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
 			print $langs->trans("RefAlreadyExists");
 		}
 		print '</td></tr>';
+
+		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td><td><input name="libelle" size="40" value="'.$product->libelle.'"></td></tr>';
 
 		if($conf->global->PRODUIT_MULTIPRICES == 1)
@@ -593,15 +595,18 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
 			print '</td></tr>';
 		}
 		
+		// VAT
 		print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
 		print $html->select_tva("tva_tx",$conf->defaulttx,$mysoc,'');
 		print '</td></tr>';
 		
+		// Status
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
 		$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
 		$html->select_array('statut',$statutarray,$_POST["statut"]);
 		print '</td></tr>';
 		
+		// Stock min level
 		if ($_GET["type"] != 1 && $conf->stock->enabled)
 		{
 			print '<tr><td>Seuil stock</td><td>';
@@ -840,6 +845,7 @@ if ($_GET["id"] || $_GET["ref"])
 				}
 				print '</td></tr>';
 			}
+
 			// Statut
 			print '<tr><td>'.$langs->trans("Status").'</td><td>';
 			print $product->getLibStatut(2);
@@ -852,22 +858,15 @@ if ($_GET["id"] || $_GET["ref"])
 			if ($product->isproduct() && $conf->stock->enabled)
 			{
 				print '<tr><td>'.$langs->trans("Stock").'</td>';
-				if ($product->no_stock)
+				if ($product->stock_reel < $product->seuil_stock_alerte)
 				{
-					print "<td>".$langs->trans("NoStockForThisProduct");
+					print '<td>'.$product->stock_reel.' '.img_warning().' (Seuil: '.$product->seuil_stock_alerte.')</td>';
 				}
 				else
 				{
-					if ($product->stock_reel <= $product->seuil_stock_alerte)
-					{
-						print '<td>'.img_warning().' '.$product->stock_reel.' Seuil : '.$product->seuil_stock_alerte;
-					}
-					else
-					{
-						print "<td>".$product->stock_reel;
-					}
+					print "<td>".$product->stock_reel.'</td>';
 				}
-				print '</td></tr>';
+				print '</tr>';
 			}
 			
 			// Description
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index e2af7afb53b..e86b7e81499 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2006 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -81,11 +80,11 @@ $sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate
 $sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte,';
 $sql.= ' p.stock_commande,';
 $sql.= ' SUM(s.reel) as stock,';
-// \TODO Bug ? On soustrait le stock commandé alors qu'il ait stocké en base en négatif. Du coup on additionne !
+// \FIXME Bug ? On soustrait le stock commandé alors qu'il ait stocké en base en négatif. Du coup on additionne !
 $sql.= ' (SUM(s.reel) - p.stock_commande) as stock_dispo';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage
-$sql.= ',' .MAIN_DB_PREFIX.'product_stock as s';
-if ($catid || ($conf->categorie->enabled && !$user->rights->categorie->voir))
+$sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock as s,'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage
+$sql.= ' '.MAIN_DB_PREFIX.'product as p';
+if ($catid || ($conf->categorie->enabled && ! $user->rights->categorie->voir))
 {
   $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
   $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 5d5d3272acd..23477eea2b8 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -145,22 +145,15 @@ if ($_GET["id"] || $_GET["ref"])
 
         // Stock
         print '<tr><td>'.$langs->trans("TotalStock").'</td>';
-        if ($product->no_stock)
-        {
-            print "<td>".$langs->trans("NoStockForThisProduct");
-        }
-        else
-        {
-            if ($product->stock_reel <= $product->seuil_stock_alerte)
-            {
-                print '<td>'.img_warning().' '.$product->stock_reel.' '.$langs->trans("StockLimit").' : '.$product->seuil_stock_alerte;
-            }
-            else
-            {
-                print "<td>".$product->stock_reel;
-            }
-        }
-        print '</td></tr>';
+		if ($product->stock_reel < $product->seuil_stock_alerte)
+		{
+			print '<td>'.$product->stock_reel.' '.img_warning().' (Seuil: '.$product->seuil_stock_alerte.')</td>';
+		}
+		else
+		{
+			print "<td>".$product->stock_reel.'</td>';
+		}
+        print '</tr>';
         
 
         // Nbre de commande clients en cours