Trad: Quelques traductions de la gestion des stocks

htdocs/langs/en_US/products.lang

@@ -51,4 +51,5 @@ AddToMyProposals=Add to my proposals
 AddToOtherProposals=Add to other proposals
 AddToMyBills=Add to my bills
 AddToOtherBills=Add to other bills
-CorrectStock=Correct stock
+CorrectStock=Correct stock
+ListOfStockMovements=List of stock movements

htdocs/langs/fr_FR/products.lang

@@ -55,4 +55,5 @@ AddToOtherProposals=Ajouter aux autres propositions
 AddToMyBills=Ajouter à mes factures
 AddToOtherBills=Ajouter aux autres factures
 CorrectStock=Corriger stock
-AddPhoto=Ajouter une photo
+AddPhoto=Ajouter une photo
+ListOfStockMovements=Liste des mouvements de stock

htdocs/product/stock/entrepot.class.php

@@ -190,24 +190,44 @@ class Entrepot
   /**
    *    \brief      Renvoie le stock (nombre de produits) de l'entrepot
    */
-  function nb_products()
+    function nb_products()
-  {
+    {
-    $sql = "SELECT sum(reel) FROM llx_product_stock WHERE fk_entrepot = ".$this->id;
+        $sql = "SELECT sum(reel) FROM llx_product_stock WHERE fk_entrepot = ".$this->id;
+        
+          $result = $this->db->query($sql) ;
+        
+          if ( $result )
+        {
+          $row = $this->db->fetch_row(0);
+          return $row[0];
+        
+          $this->db->free();
+        }
+          else
+        {
+          return 0;
+        }
+    }
 
-      $result = $this->db->query($sql) ;
 
-      if ( $result )
+    /**
-	{
+     *    \brief      Retourne le libellé du statut d'un entrepot (ouvert, fermé)
-	  $row = $this->db->fetch_row(0);
+     *    \return     string      Libellé
-	  return $row[0];
+     */
-
+    function getLibStatut()
-	  $this->db->free();
+    {
-	}
+    	return $this->LibStatut($this->statut);
-      else
+    }
-	{
+    
-	  return 0;
+    /**
-	}
+     *    \brief      Renvoi le libellé d'un statut donné
-  }
+     *    \param      statut      id statut
+     *    \return     string      Libellé
+     */
+    function LibStatut($statut)
+    {
+        return $this->statuts[$statut];
+    }
   
 }
 ?>

htdocs/product/stock/index.php

@@ -21,13 +21,15 @@
  *
  */
 
-/**     \file       htdocs/product/stock/index.php
+/**
+        \file       htdocs/product/stock/index.php
         \ingroup    stock
         \brief      Page accueil stocks produits
         \version    $Revision$
 */
 
-require("./pre.inc.php");
+require_once("./pre.inc.php");
+require_once("./entrepot.class.php");
 
 /*
  *
@@ -37,8 +39,9 @@ require("./pre.inc.php");
 llxHeader("","",$langs->trans("Stocks"));
 
 print_titre($langs->trans("Stocks"));
+print '<br>';
 
-print '<table class="border" width="100%">';
+print '<table class="noborder" width="100%">';
 print '<tr><td valign="top" width="30%">';
 
 $sql = "SELECT e.label, e.rowid, e.statut FROM ".MAIN_DB_PREFIX."entrepot as e";
@@ -46,33 +49,32 @@ $sql .= " ORDER BY e.statut DESC ";
 $sql .= $db->plimit(15 ,0);
 $result = $db->query($sql) ;
 
-$statuts[0] = "Fermé";
-$statuts[1] = "Ouvert";
-
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
 
   $i = 0;
   
   if ($num > 0)
     {
+      $entrepot=new Entrepot($db);
+      
       print '<table class="noborder" width="100%">';
 
-      print '<tr class="liste_titre"><td colspan="2">Entrepôts</td></tr>';
+      print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Warehouses").'</td></tr>';
     
       $var=True;
       while ($i < $num)
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
-	  print "<td><a href=\"fiche.php?id=$objp->rowid\">$objp->label</a></td>\n";
+	  print "<td><a href=\"fiche.php?id=$objp->rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."</a></td>\n";
-	  print '<td align="right">'.$statuts[$objp->statut].'</td>';
+	  print '<td align="right">'.$entrepot->LibStatut($objp->statut).'</td>';
 	  print "</tr>\n";
 	  $i++;
 	}
-      $db->free();
+      $db->free($result);
 
       print "</table>";
     }

htdocs/product/stock/mouvement.php

@@ -21,7 +21,8 @@
  *
  */
 
-/**     \file       htdocs/product/stock/mouvement.php
+/**
+        \file       htdocs/product/stock/mouvement.php
         \ingroup    stock
         \brief      Page liste des mouvements de stocks
         \version    $Revision$
@@ -30,14 +31,10 @@
 require("./pre.inc.php");
 $user->getrights('produit');
 
-if (!$user->rights->produit->lire)
+$langs->load("products");
-  accessforbidden();
 
+if (!$user->rights->produit->lire) accessforbidden();
 
-/*
- *
- *
- */
 
 $page = $_GET["page"];
 $sortfield = $_GET["sortfield"];
@@ -49,13 +46,8 @@ if ($page < 0) {
 $limit = $conf->liste_limit;
 $offset = $limit * $page ;
   
-if ($sortfield == "") {
+if (! $sortfield) $sortfield="m.datem";
-  $sortfield="m.datem"; }
+if (! $sortorder) $sortorder="DESC";
-     
-if ($sortorder == "")
-{
-  $sortorder="DESC";
-}
   
 $sql = "SELECT p.rowid, p.label as produit, s.label as stock, m.value, ".$db->pdate("m.datem")." as datem, s.rowid as entrepot_id";
 $sql .= " FROM llx_product as p, llx_entrepot as s, llx_stock_mouvement as m";
@@ -67,11 +59,11 @@ $result = $db->query($sql) ;
 
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
 
   $i = 0;
   
-  $texte = "Liste des mouvements";
+  $texte = $langs->trans("ListOfStockMovements");
   llxHeader("","",$texte);
   
   print_barre_liste($texte, $page, "mouvement.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num);
@@ -87,7 +79,7 @@ if ($result)
   $var=True;
   while ($i < min($num,$limit))
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td><a href=\"../fiche.php?id=$objp->rowid\">$objp->produit</a></td>\n";
@@ -97,7 +89,7 @@ if ($result)
       print "</tr>\n";
       $i++;
     }
-  $db->free();
+  $db->free($result);
 
   print "</table>";