lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad message

Browse Source
This commit is contained in:
Laurent Destailleur 2012-10-06 22:54:23 +02:00
parent 4789b5e2d1
commit 430b63f4e1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/stocks.lang
View File

@ -38,6 +38,7 @@ NumberOfUnit=Number of units
UnitPurchaseValue=Unit purchase price UnitPurchaseValue=Unit purchase price
TotalStock=Total in stock TotalStock=Total in stock
StockTooLow=Stock too low StockTooLow=Stock too low
StockLowerThanLimit=Stock lower than alert limit
EnhancedValue=Value EnhancedValue=Value
PMPValue=Weighted average price PMPValue=Weighted average price
PMPValueShort=WAP PMPValueShort=WAP

1
htdocs/langs/fr_FR/stocks.lang
View File

@ -38,6 +38,7 @@ NumberOfUnit=Nombre de pièces
UnitPurchaseValue=Prix d'achat unitaire UnitPurchaseValue=Prix d'achat unitaire
TotalStock=Total en stock TotalStock=Total en stock
StockTooLow=Stock insuffisant StockTooLow=Stock insuffisant
StockLowerThanLimit=Stock inférieur au seuil d'alerte
EnhancedValue=Valorisation EnhancedValue=Valorisation
PMPValue=Valorisation (PMP) PMPValue=Valorisation (PMP)
PMPValueShort=PMP PMPValueShort=PMP

14
htdocs/product/stock/product.php
View File

@ -243,11 +243,16 @@ if ($id > 0 || $ref)
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Stock
print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).'</td><td colspan="2">';
print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer);
print '</td></tr>';
// Real stock // Real stock
$product->load_stock(); $product->load_stock();
print '<tr><td>'.$langs->trans("PhysicalStock").'</td>'; print '<tr><td>'.$langs->trans("PhysicalStock").'</td>';
print '<td>'.$product->stock_reel; print '<td>'.$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 '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -276,7 +281,7 @@ if ($id > 0 || $ref)
print "<td>".$product->stock_theorique; print "<td>".$product->stock_theorique;
if ($product->stock_theorique < $product->seuil_stock_alerte) if ($product->stock_theorique < $product->seuil_stock_alerte)
{ {
print ' '.img_warning($langs->trans("StockTooLow")); print ' '.img_warning($langs->trans("StockLowerThanLimit"));
} }
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -313,11 +318,6 @@ if ($id > 0 || $ref)
print '</td></tr>'; print '</td></tr>';
} }
// Stock
print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).'</td><td colspan="2">';
print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer);
print '</td></tr>';
// Last movement // Last movement
$sql = "SELECT max(m.datem) as datem"; $sql = "SELECT max(m.datem) as datem";
$sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m"; $sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";