diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 4de8033bbf6..88052ffec54 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -41,7 +41,7 @@ OrderDispatch=Order dispatching DeStockReStockOnBill=Decrease/increase stocks on invoices/credit notes DeStockReStockOnValidateOrder=Decrease/increase stocks on orders notes DeStockReStockOnShipment=Decrease/increase stocks on shipment -StockAvailable=Available stock -StockInstant=Real stock StockLimitShort=Limit -StockLimit=Stock limit \ No newline at end of file +StockLimit=Stock limit +PhysicalStock=Physical stock +RealStock=Real Stock \ No newline at end of file diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 9fbf18f7955..2f9da5c169d 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -41,7 +41,7 @@ OrderDispatch=Ventilation commande DeStockReStockOnBill=Décrémente/Incrémente les stocks sur les factures/avoirs DeStockReStockOnValidateOrder=Décrémente/Incrémente les stocks sur les commandes DeStockReStockOnShipment=Décrémente/Incrémente les stocks sur les expéditions -StockAvailable=Stock disponible -StockInstant=Stock actuel StockLimitShort=Seuil -StockLimit=Seuil stock \ No newline at end of file +StockLimit=Seuil stock +PhysicalStock=Stock physique +RealStock=Stock réel \ No newline at end of file diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 4f47ef2245f..5670be1f322 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -51,7 +51,7 @@ $type=trim($type); $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; -if (! $sortfield) $sortfield="stock_dispo"; +if (! $sortfield) $sortfield="stock_real"; if (! $sortorder) $sortorder="ASC"; $page = $_GET["page"]; $limit = $conf->liste_limit; @@ -80,7 +80,7 @@ $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,'; -$sql.= ' (SUM(s.reel) - p.stock_commande) as stock_dispo'; +$sql.= ' (SUM(s.reel) - p.stock_commande) as stock_real'; //Todo: Il faudra additionner les commandes fournisseurs $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)) @@ -189,9 +189,9 @@ if ($resql) print ""; print_liste_field_titre($langs->trans("Ref"),"reassort.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),"reassort.php", "p.label","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield,$sortorder); - 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); + print_liste_field_titre($langs->trans("RealStock"),"reassort.php", "stock_real","&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("PhysicalStock"),"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"; @@ -254,7 +254,7 @@ if ($resql) } else { - if ( $objp->stock_dispo > $objp->seuil_stock_alerte) { + if ( $objp->stock_real > $objp->seuil_stock_alerte) { print img_object($langs->trans("ShowProduct"),"product"); } else { print img_warning($langs->trans("StockTooLow")); @@ -273,7 +273,7 @@ if ($resql) else print $objp->duration; print ''; } - print ''.$objp->stock_dispo.''; + print ''.$objp->stock_real.''; print ''.$objp->stock.''; print ''.$objp->seuil_stock_alerte.''; print ''.$product_static->LibStatut($objp->statut,5).'';