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

Merge pull request #22126 from atm-adrien/FIX_inventory_columns

Browse Source 
FIX : inventory total columns
This commit is contained in:
Laurent Destailleur 2022-09-09 18:01:03 +02:00 committed by GitHub
commit b873034ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,18 +950,22 @@ if ($object->id > 0) {
print '</td>'; print '</td>';
} }
print '<td class="right"></td>'; print '<td class="right"></td>';
print '<td class="right">';
print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
print '</td>';
if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) { if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
print '<td class="right">'; print '<td class="right">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print '</td>'; print '</td>';
print '<td class="right">';
print '</td>';
} else {
print '<td class="right">';
print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
print '</td>';
} }
// Actions // Actions
print '<td class="center">'; print '<td class="center">';
@ -1160,9 +1164,9 @@ if ($object->id > 0) {
} }
if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) { if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="5">'.$langs->trans("Total").'</td>'; print '<td colspan="4">'.$langs->trans("Total").'</td>';
print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>'; print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
print '<td class="right" id="totalRealValuation" colspan="2">'.price($totalRealValuation).'</td>'; print '<td class="right" id="totalRealValuation" colspan="3">'.price($totalRealValuation).'</td>';
print '<td></td>'; print '<td></td>';
print '</tr>'; print '</tr>';
} }