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

NEW Can receive more than qty ordered on reception

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-10 16:58:38 +02:00
parent 9a6bfd003d
commit 6914e2bb2a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/fourn/js/lib_dispatch.js.php
View File

@ -69,13 +69,15 @@ function addDispatchLine(index, type, mode)
{ {
mode = mode || 'qtymissing' mode = mode || 'qtymissing'
console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
var $row0 = $("tr[name='"+type+'_0_'+index+"']"); var $row0 = $("tr[name='"+type+'_0_'+index+"']");
var $dpopt = $row0.find('.hasDatepicker').first().datepicker('option', 'all'); // get current datepicker options to apply the same to the cloned datepickers var $dpopt = $row0.find('.hasDatepicker').first().datepicker('option', 'all'); // get current datepicker options to apply the same to the cloned datepickers
var $row = $row0.clone(true); // clone first batch line to jQuery object var $row = $row0.clone(true); // clone first batch line to jQuery object
var nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length; // position of line for batch var nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length; // position of line for batch
var qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()); // Qty ordered is same for all rows var qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()); // Qty ordered is same for all rows
var qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val()); var qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val());
console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode+" qtyOrdered="+qtyOrdered+" qty="+qty);
var qtyDispatched; var qtyDispatched;
if (mode === 'lessone') if (mode === 'lessone')
@ -93,9 +95,17 @@ function addDispatchLine(index, type, mode)
} }
console.log("qtyDispatched="+qtyDispatched+" qtyOrdered="+qtyOrdered); console.log("qtyDispatched="+qtyDispatched+" qtyOrdered="+qtyOrdered);
if (qtyDispatched >= qtyOrdered || qtyOrdered <= 1) { if (qty <= 1) {
window.alert("Remain quantity to dispatch is too low to be split"); window.alert("Remain quantity to dispatch is too low to be split");
} else if (qtyDispatched < qtyOrdered) { } else {
oldlineqty = qtyDispatched;
newlineqty = qtyOrdered - qtyDispatched;
if (newlineqty <= 0) {
newlineqty = qty - 1;
oldlineqty = 1;
$("#qty_"+(nbrTrs - 1)+"_"+index).val(oldlineqty);
}
//replace tr suffix nbr //replace tr suffix nbr
$row.html($row.html().replace(/_0_/g,"_"+nbrTrs+"_")); $row.html($row.html().replace(/_0_/g,"_"+nbrTrs+"_"));
@ -127,7 +137,7 @@ function addDispatchLine(index, type, mode)
/* Suffix of lines are: _ trs.length _ index */ /* Suffix of lines are: _ trs.length _ index */
$("#qty_"+nbrTrs+"_"+index).focus(); $("#qty_"+nbrTrs+"_"+index).focus();
$("#qty_dispatched_0_"+index).val(qtyDispatched); $("#qty_dispatched_0_"+index).val(oldlineqty);
//hide all buttons then show only the last one //hide all buttons then show only the last one
$("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide(); $("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide();
@ -138,7 +148,7 @@ function addDispatchLine(index, type, mode)
qty = 1; // keep 1 in old line qty = 1; // keep 1 in old line
$("#qty_"+(nbrTrs-1)+"_"+index).val(qty); $("#qty_"+(nbrTrs-1)+"_"+index).val(qty);
} }
$("#qty_"+nbrTrs+"_"+index).val(qtyOrdered - qtyDispatched); $("#qty_"+nbrTrs+"_"+index).val(newlineqty);
// Store arbitrary data for dispatch qty input field change event // Store arbitrary data for dispatch qty input field change event
$("#qty_"+(nbrTrs-1)+"_"+index).data('qty', qty); $("#qty_"+(nbrTrs-1)+"_"+index).data('qty', qty);
$("#qty_"+(nbrTrs-1)+"_"+index).data('type', type); $("#qty_"+(nbrTrs-1)+"_"+index).data('type', type);