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

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-06 22:56:57 +02:00
commit d3097b07b6
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/product/stock/stockatdate.php
View File

@ -476,6 +476,8 @@ print $hookmanager->resPrint;
print "</tr>\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 '<td class="right">'.$currentstock.'</td>';
$totalcurrentstock += $currentstock;
print '<td class="right"></td>';
@ -554,6 +557,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Final virtual stock
print '<td class="right">'.$virtualstock.'</td>';
$totalvirtualstock += $virtualstock;
} else {
// Stock at date
print '<td class="right">'.($stock ? $stock : '<span class="opacitymedium">'.$stock.'</span>').'</td>';
@ -587,6 +591,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Current stock
print '<td class="right">'.($currentstock ? $currentstock : '<span class="opacitymedium">0</span>').'</td>';
$totalcurrentstock += $currentstock;
}
// Action
@ -615,8 +620,23 @@ if ($mode == 'future') {
if (empty($date) || !$dateIsValid) {
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EnterADateCriteria").'</span></td></tr>';
} else {
print '<tr class="liste_total"><td>'.$langs->trans("Totalforthispage").'</td>';
print '<td></td><td></td><td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td><td></td><td></td><td></td><td></td></tr>';
print '<tr class="liste_total">';
print '<td>'.$langs->trans("Totalforthispage").'</td>';
print '<td></td>';
if ($mode == 'future') {
print '<td class="right">'.price(price2num($totalcurrentstock, 'MS')).'</td>';
print '<td></td>';
print '<td></td>';
print '<td class="right">'.price(price2num($totalvirtualstock, 'MS')).'</td>';
} else {
print '<td></td>';
print '<td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td>';
print '<td></td>';
print '<td></td>';
print '<td class="right">'.($productid > 0 ? price(price2num($totalcurrentstock, 'MS')) : '').'</td>';
}
print '<td></td>';
print '</tr>';
}
print '</table>';