diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 6056057be06..1c7452f6a19 100644 --- a/htdocs/langs/en_US/products.lang +++ b/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 \ No newline at end of file +CorrectStock=Correct stock +ListOfStockMovements=List of stock movements \ No newline at end of file diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index b4f67d0a3f5..f5a3a5f944c 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/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 \ No newline at end of file +AddPhoto=Ajouter une photo +ListOfStockMovements=Liste des mouvements de stock \ No newline at end of file diff --git a/htdocs/product/stock/entrepot.class.php b/htdocs/product/stock/entrepot.class.php index 658601aec30..960911bdb5d 100644 --- a/htdocs/product/stock/entrepot.class.php +++ b/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() - { - $sql = "SELECT sum(reel) FROM llx_product_stock WHERE fk_entrepot = ".$this->id; + function nb_products() + { + $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 ) - { - $row = $this->db->fetch_row(0); - return $row[0]; - - $this->db->free(); - } - else - { - return 0; - } - } + /** + * \brief Retourne le libellé du statut d'un entrepot (ouvert, fermé) + * \return string Libellé + */ + function getLibStatut() + { + return $this->LibStatut($this->statut); + } + + /** + * \brief Renvoi le libellé d'un statut donné + * \param statut id statut + * \return string Libellé + */ + function LibStatut($statut) + { + return $this->statuts[$statut]; + } } ?> diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index d487f42eafd..0c2180064c4 100644 --- a/htdocs/product/stock/index.php +++ b/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 '
'; -print ''; +print '
'; print '"; print "\n"; @@ -97,7 +89,7 @@ if ($result) print "\n"; $i++; } - $db->free(); + $db->free($result); print "
'; $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 ''; - print ''; + print ''; $var=True; while ($i < $num) { - $objp = $db->fetch_object( $i); + $objp = $db->fetch_object($result); $var=!$var; print ""; - print "\n"; - print ''; + print "\n"; + print ''; print "\n"; $i++; } - $db->free(); + $db->free($result); print "
Entrepôts
'.$langs->trans("Warehouses").'
rowid\">$objp->label'.$statuts[$objp->statut].'rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."'.$entrepot->LibStatut($objp->statut).'
"; } diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index abbdc882624..08200929814 100644 --- a/htdocs/product/stock/mouvement.php +++ b/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) - accessforbidden(); +$langs->load("products"); +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 == "") { - $sortfield="m.datem"; } - -if ($sortorder == "") -{ - $sortorder="DESC"; -} +if (! $sortfield) $sortfield="m.datem"; +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 "
rowid\">$objp->produit
";