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

Fix limit into message

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-17 18:52:01 +02:00
parent c224e2b4f6
commit f3838ee8f2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_produits_alerte_stock.php
View File

@ -159,7 +159,7 @@ class box_produits_alerte_stock extends ModeleBoxes
$this->info_box_contents[$line][] = array('td' => 'align="center"', $this->info_box_contents[$line][] = array('td' => 'align="center"',
'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte, 'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit"))); 'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
$this->info_box_contents[$line][] = array('td' => 'align="right" width="18"', $this->info_box_contents[$line][] = array('td' => 'align="right" width="18"',
'text' => $productstatic->LibStatut($objp->tosell,3,0)); 'text' => $productstatic->LibStatut($objp->tosell,3,0));

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

@ -42,7 +42,7 @@ LabelMovement=Movement label
NumberOfUnit=Number of units NumberOfUnit=Number of units
UnitPurchaseValue=Unit purchase price UnitPurchaseValue=Unit purchase price
StockTooLow=Stock too low StockTooLow=Stock too low
StockLowerThanLimit=Stock lower than alert limit StockLowerThanLimit=Stock lower than alert limit (%s)
EnhancedValue=Value EnhancedValue=Value
PMPValue=Weighted average price PMPValue=Weighted average price
PMPValueShort=WAP PMPValueShort=WAP

4
htdocs/product/list.php
View File

@ -803,7 +803,7 @@ else
print '<td align="right">'; print '<td align="right">';
if ($obj->fk_product_type != 1) if ($obj->fk_product_type != 1)
{ {
if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' '; if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
print $product_static->stock_reel; print $product_static->stock_reel;
} }
print '</td>'; print '</td>';
@ -814,7 +814,7 @@ else
print '<td align="right">'; print '<td align="right">';
if ($obj->fk_product_type != 1) if ($obj->fk_product_type != 1)
{ {
if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' '; if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
print $product_static->stock_theorique; print $product_static->stock_theorique;
} }
print '</td>'; print '</td>';

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

@ -638,7 +638,7 @@ if ($id > 0 || $ref)
print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1); print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
print '</td>'; print '</td>';
print '<td>'.price2num($object->stock_reel, 'MS'); print '<td>'.price2num($object->stock_reel, 'MS');
if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit")); if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -689,7 +689,7 @@ if ($id > 0 || $ref)
print "<td>"; print "<td>";
//print (empty($stocktheo)?0:$stocktheo); //print (empty($stocktheo)?0:$stocktheo);
print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff); print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit")); if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';