From bd40959922e01cc94a9d91685ce099b711c17585 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 31 Mar 2006 14:20:45 +0000
Subject: [PATCH] =?UTF-8?q?d=E9but=20ajout=20possibilit=E9=20de=20d=E9term?=
 =?UTF-8?q?iner=20si=20le=20contenu=20d'une=20cat=E9gorie=20sera=20visible?=
 =?UTF-8?q?=20ou=20=20non=20dans=20la=20liste=20des=20produits/services,?=
 =?UTF-8?q?=20ceci=20afin=20de=20pouvoir=20cacher=20les=20sous-produits=20?=
 =?UTF-8?q?=20par=20exemple.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/langs/en_US/products.lang |  4 ++++
 htdocs/langs/en_US/stocks.lang   |  3 ++-
 htdocs/langs/fr_FR/products.lang |  1 +
 htdocs/langs/fr_FR/stocks.lang   |  3 ++-
 htdocs/product/stock/fiche.php   | 11 ++++++-----
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 5cd0322d0dd..f600733cfa7 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -4,6 +4,8 @@ Products=Products
 Services=Services
 Product=Product
 Service=Service
+Create=Create
+References=References
 NewProduct=New product
 NewService=New service
 ProductCode=Product code
@@ -17,6 +19,7 @@ ProductsOnSell=Products on sell
 ProductsNotOnSell=Products out of sell
 ServicesOnSell=Services on sell
 ServicesNotOnSell=Services out of sell
+InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
 LastRecordedProducts=Last %s products/services recorded
 LastProducts=Last products
@@ -24,6 +27,7 @@ CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
+Warehouses=Warehouses
 NewWarehouse=New warehouse
 WarehouseOpened=Warehouse opened
 WarehouseClosed=Warehouse closed
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 7bd512a0469..b3f97381c1b 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -18,4 +18,5 @@ Location=Lieu
 LocationSummary=Short name location
 NumberOfProducts=Total number of products
 LastMovement=Last movement
-LastMovements=Last movements
\ No newline at end of file
+LastMovements=Last movements
+Units=Units
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 0b9d14edc3b..b8f239e1350 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -5,6 +5,7 @@ Services=Services
 Product=Produit
 Service=Service
 Create=Créer
+References=Références
 NewProduct=Nouveau produit
 NewService=Nouveau service
 ProductCode=Code produit
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index c98e11d05ee..e1693b72c84 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -18,4 +18,5 @@ Location=Lieu
 LocationSummary=Nom court du lieu
 NumberOfProducts=Nombre total de produits
 LastMovement=Dernier mouvement
-LastMovements=Derniers mouvements
\ No newline at end of file
+LastMovements=Derniers mouvements
+Units=Unités
\ No newline at end of file
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 73bfae25039..c1bf3352a9d 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -269,10 +269,11 @@ else
             print '<table class="noborder" width="100%">';
             print "<tr class=\"liste_titre\">";
 
-            print_liste_field_titre($langs->trans("Product"),"", "p.ref","","","",$sortfield);
-
+            print_liste_field_titre($langs->trans("Reference"),"", "p.ref","","","",$sortfield);
+            
+            print "<td>".$langs->trans("Label")."</td>";
             print "<td align=\"center\">".$langs->trans("Units")."</td>";
-            print "</tr>\n";
+            print "</tr>";
             $sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, ps.reel as value ";
             $sql .= " FROM ".MAIN_DB_PREFIX."product_stock ps, ".MAIN_DB_PREFIX."product p ";
             if ($conf->categorie->enabled && !$user->rights->categorie->voir)
@@ -320,13 +321,13 @@ else
                     //print '<td>'.dolibarr_print_date($objp->datem).'</td>';
                     print "<td><a href=\"../fiche.php?id=$objp->rowid\">";
                     print img_object($langs->trans("ShowProduct"),"product").' '.$objp->ref;
-                    print "</a></td>\n";
+                    print "</a></td>";
                     print '<td>'.$objp->produit.'</td>';
                     print '<td align="center">'.$objp->value.'</td>';
                     //print "<td><a href=\"fiche.php?id=$objp->entrepot_id\">";
                     //print img_object($langs->trans("ShowWarehous"),"stock").' '.$objp->stock;
                     //print "</a></td>\n";
-                    print "</tr>\n";
+                    print "</tr>";
                     $i++;
                 }
                 $db->free($resql);