diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index 82d818af2c9..6297dbcb15b 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -476,6 +476,8 @@ print $hookmanager->resPrint; print "\n"; $totalbuyingprice = 0; +$totalcurrentstock = 0; +$totalvirtualstock = 0; $i = 0; while ($i < ($limit ? min($num, $limit) : $num)) { @@ -546,6 +548,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { if ($mode == 'future') { // Current stock print ''.$currentstock.''; + $totalcurrentstock += $currentstock; print ''; @@ -554,6 +557,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { // Final virtual stock print ''.$virtualstock.''; + $totalvirtualstock += $virtualstock; } else { // Stock at date print ''.($stock ? $stock : ''.$stock.'').''; @@ -587,6 +591,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { // Current stock print ''.($currentstock ? $currentstock : '0').''; + $totalcurrentstock += $currentstock; } // Action @@ -615,8 +620,23 @@ if ($mode == 'future') { if (empty($date) || !$dateIsValid) { print ''.$langs->trans("EnterADateCriteria").''; } else { - print ''.$langs->trans("Totalforthispage").''; - print ''.price(price2num($totalbuyingprice, 'MT')).''; + print ''; + print ''.$langs->trans("Totalforthispage").''; + print ''; + if ($mode == 'future') { + print ''.price(price2num($totalcurrentstock, 'MS')).''; + print ''; + print ''; + print ''.price(price2num($totalvirtualstock, 'MS')).''; + } else { + print ''; + print ''.price(price2num($totalbuyingprice, 'MT')).''; + print ''; + print ''; + print ''.($productid > 0 ? price(price2num($totalcurrentstock, 'MS')) : '').''; + } + print ''; + print ''; } print '';