From 430b63f4e108e4a72031cfb4537788f0884405d3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 6 Oct 2012 22:54:23 +0200 Subject: [PATCH] Fix: Bad message --- htdocs/langs/en_US/stocks.lang | 1 + htdocs/langs/fr_FR/stocks.lang | 1 + htdocs/product/stock/product.php | 14 +++++++------- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 83e04ff5148..25ab06d758c 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -38,6 +38,7 @@ NumberOfUnit=Number of units UnitPurchaseValue=Unit purchase price TotalStock=Total in stock StockTooLow=Stock too low +StockLowerThanLimit=Stock lower than alert limit EnhancedValue=Value PMPValue=Weighted average price PMPValueShort=WAP diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index c00ac2b4b13..3c15858ea9a 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -38,6 +38,7 @@ NumberOfUnit=Nombre de pièces UnitPurchaseValue=Prix d'achat unitaire TotalStock=Total en stock StockTooLow=Stock insuffisant +StockLowerThanLimit=Stock inférieur au seuil d'alerte EnhancedValue=Valorisation PMPValue=Valorisation (PMP) PMPValueShort=PMP diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index dc3491d1e18..59e15cd4cbe 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -243,11 +243,16 @@ if ($id > 0 || $ref) print ''; print ''; + // Stock + print ''.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).''; + print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer); + print ''; + // Real stock $product->load_stock(); print ''.$langs->trans("PhysicalStock").''; print ''.$product->stock_reel; - if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockTooLow")); + if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit")); print ''; print ''; @@ -276,7 +281,7 @@ if ($id > 0 || $ref) print "".$product->stock_theorique; if ($product->stock_theorique < $product->seuil_stock_alerte) { - print ' '.img_warning($langs->trans("StockTooLow")); + print ' '.img_warning($langs->trans("StockLowerThanLimit")); } print ''; print ''; @@ -313,11 +318,6 @@ if ($id > 0 || $ref) print ''; } - // Stock - print ''.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).''; - print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer); - print ''; - // Last movement $sql = "SELECT max(m.datem) as datem"; $sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";