diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 88052ffec54..ddc2da14ff6 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -44,4 +44,5 @@ DeStockReStockOnShipment=Decrease/increase stocks on shipment
StockLimitShort=Limit
StockLimit=Stock limit
PhysicalStock=Physical stock
-RealStock=Real Stock
\ No newline at end of file
+RealStock=Real Stock
+TheoreticalStock=Stock théorique
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 2f9da5c169d..b8c926d8dbb 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -44,4 +44,5 @@ DeStockReStockOnShipment=D
StockLimitShort=Seuil
StockLimit=Seuil stock
PhysicalStock=Stock physique
-RealStock=Stock réel
\ No newline at end of file
+RealStock=Stock réel
+TheoreticalStock=Stock théorique
\ No newline at end of file
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index bbe96a090a9..9871915177c 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_real";
+if (! $sortfield) $sortfield="stock_theorique";
if (! $sortorder) $sortorder="ASC";
$page = $_GET["page"];
$limit = $conf->liste_limit;
@@ -79,8 +79,8 @@ $title=$langs->trans("ProductsAndServices");
$sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate('p.tms').' as datem,';
$sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte,';
$sql.= ' p.stock_commande,';
-$sql.= ' SUM(s.reel) as stock_physical,';
-$sql.= ' (SUM(s.reel) - p.stock_commande) as stock_real'; //Todo: Il faudra additionner les commandes fournisseurs
+$sql.= ' SUM(s.reel) as stock_physique,';
+$sql.= ' (SUM(s.reel) - p.stock_commande) as stock_theorique'; //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("RealStock"),"reassort.php", "stock_real","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("TheoreticalStock"),"reassort.php", "stock_theorique","&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("PhysicalStock"),"reassort.php", "stock_physical","&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_physique","&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", "p.seuil_stock_alerte","&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_real > $objp->seuil_stock_alerte) {
+ if ( $objp->stock_theorique > $objp->seuil_stock_alerte) {
print img_object($langs->trans("ShowProduct"),"product");
} else {
print img_warning($langs->trans("StockTooLow"));
@@ -273,8 +273,8 @@ if ($resql)
else print $objp->duration;
print '';
}
- print ''.$objp->stock_real.' | ';
- print ''.$objp->stock_physical.' | ';
+ print ''.$objp->stock_theorique.' | ';
+ print ''.$objp->stock_physique.' | ';
print ''.$objp->seuil_stock_alerte.' | ';
print ''.$product_static->LibStatut($objp->statut,5).' | ';
print "\n";