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

Fix inventory

Browse Source
This commit is contained in:
Laurent Destailleur 2021-05-12 09:22:49 +02:00
parent b8254186ce
commit f334f2a255
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ if ($action == 'cancel_record' && $permissiontoadd) {
$object->setCanceled($user); $object->setCanceled($user);
} }
if ($action == 'update' && $user->rights->stock->mouvement->creer) { if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) {
$stockmovment = new MouvementStock($db); $stockmovment = new MouvementStock($db);
$stockmovment->origin = $object; $stockmovment->origin = $object;
@ -160,7 +160,7 @@ if ($action == 'update' && $user->rights->stock->mouvement->creer) {
} }
} }
if (($action == 'record' || $action =='updateinventorylines') && $permissiontoadd) { if ($action =='updateinventorylines' && $permissiontoadd) {
$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,'; $sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated'; $sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id'; $sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
@ -301,16 +301,19 @@ llxHeader('', $langs->trans('Inventory'), $help_url);
// Disable button Generate movement if data were not saved // Disable button Generate movement if data were not saved
print '<script type="text/javascript" language="javascript"> print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() { function disablebuttonmakemovementandclose() {
jQuery(".realqty").keyup(function() {
console.log("Disable button idbuttonmakemovementandclose until we save"); console.log("Disable button idbuttonmakemovementandclose until we save");
jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\'); jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\'); jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
};
jQuery(document).ready(function() {
jQuery(".realqty").keyup(function() {
disablebuttonmakemovementandclose();
}); });
jQuery(".realqty").change(function() { jQuery(".realqty").change(function() {
console.log("Disable button idbuttonmakemovementandclose until we save"); disablebuttonmakemovementandclose();
jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
}); });
}); });
</script>'; </script>';
@ -466,7 +469,7 @@ if ($object->id > 0) {
// Save // Save
if ($object->status == $object::STATUS_VALIDATED) { if ($object->status == $object::STATUS_VALIDATED) {
if ($permissiontoadd) { if ($permissiontoadd) {
print '<a class="butAction" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n"; print '<a class="butAction" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'" title="'.dol_escape_htmltag("SaveQtyFirst").'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
} else { } else {
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n"; print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
} }
@ -598,6 +601,7 @@ if ($object->id > 0) {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$totalfound = 0;
$totalarray = array(); $totalarray = array();
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -647,6 +651,7 @@ 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) ? GETPOST("id_".$obj->rowid) : $obj->qty_view; $qty_view = GETPOST("id_".$obj->rowid) ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
$totalfound += price2num($qty_view, 'MS');
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">';
@ -654,6 +659,7 @@ if ($object->id > 0) {
print '</td>'; print '</td>';
} else { } else {
print $obj->qty_view; print $obj->qty_view;
$totalfound += $obj->qty_view;
print '</td>'; print '</td>';
} }
print '</tr>'; print '</tr>';
@ -674,6 +680,14 @@ if ($object->id > 0) {
print '</div>'; print '</div>';
// Call method to disable the button if no qty entered yet for inventory
if ($object->status != $object::STATUS_VALIDATED || $totalfound == 0) {
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
disablebuttonmakemovementandclose();
});
</script>';
}
print '</form>'; print '</form>';
} }