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

Merge pull request #18901 from xgerhard/disabled-button-zero-qty-fix

Browse Source 
Fix #18890 Fix disabled button if sum real qty is 0
This commit is contained in:
Laurent Destailleur 2021-10-06 13:49:12 +02:00 committed by GitHub
commit b93110e4f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,7 +716,7 @@ if ($object->id > 0) {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$totalfound = 0; $hasinput = false;
$totalarray = array(); $totalarray = array();
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -766,7 +766,10 @@ if ($object->id > 0) {
print '<td class="center">'; print '<td class="center">';
if ($object->status == $object::STATUS_VALIDATED) { if ($object->status == $object::STATUS_VALIDATED) {
$qty_view = GETPOST("id_".$obj->rowid) && price2num(GETPOST("id_".$obj->rowid), 'MS') >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view; $qty_view = GETPOST("id_".$obj->rowid) && price2num(GETPOST("id_".$obj->rowid), 'MS') >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
$totalfound += price2num($qty_view, 'MS'); if (!$hasinput && $qty_view !== null && $obj->qty_stock != $qty_view) {
$hasinput = true;
}
print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">'; print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
@ -777,7 +780,6 @@ if ($object->id > 0) {
print '<input type="hidden" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">'; print '<input type="hidden" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
} else { } else {
print $obj->qty_view; print $obj->qty_view;
$totalfound += $obj->qty_view;
print '</td>'; print '</td>';
} }
print '</tr>'; print '</tr>';
@ -799,7 +801,7 @@ if ($object->id > 0) {
print '</div>'; print '</div>';
// Call method to disable the button if no qty entered yet for inventory // Call method to disable the button if no qty entered yet for inventory
if ($object->status != $object::STATUS_VALIDATED || $totalfound == 0) { if ($object->status != $object::STATUS_VALIDATED || !$hasinput) {
print '<script type="text/javascript" language="javascript"> print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() { jQuery(document).ready(function() {
disablebuttonmakemovementandclose(); disablebuttonmakemovementandclose();