diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 6b294125ca0..4de8033bbf6 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -44,4 +44,4 @@ DeStockReStockOnShipment=Decrease/increase stocks on shipment StockAvailable=Available stock StockInstant=Real stock StockLimitShort=Limit -StockLimit=Stock limit +StockLimit=Stock limit \ No newline at end of file diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index e86b7e81499..4f47ef2245f 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -80,9 +80,8 @@ $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,'; -// \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_stock as s,'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage +$sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock as s,'; $sql.= ' '.MAIN_DB_PREFIX.'product as p'; if ($catid || ($conf->categorie->enabled && ! $user->rights->categorie->voir)) { @@ -193,6 +192,7 @@ if ($resql) print_liste_field_titre($langs->trans("StockAvailable"),"reassort.php", "p.stock_dispo","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); if ($conf->service->enabled && $type == 1) print_liste_field_titre($langs->trans("Duration"),"reassort.php", "p.duration","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("StockInstant"),"reassort.php", "stock","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("StockLimit"),"reassort.php", "stock","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),"reassort.php", "p.envente","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); print "\n"; @@ -214,10 +214,7 @@ if ($resql) print ' '; print ''; } - print ''; - print ' '; - print ''; - print ''; + print ''; print ' '; print ''; print ''; @@ -278,6 +275,7 @@ if ($resql) } print ''.$objp->stock_dispo.''; print ''.$objp->stock.''; + print ''.$objp->seuil_stock_alerte.''; print ''.$product_static->LibStatut($objp->statut,5).''; print "\n"; $i++;