';
print ' | ';
if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
- print '';
+ if(isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])){
+ $deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
+ }
+ else{
+ if(!isset($alreadyQtySetted[$line->fk_product])){
+ $alreadyQtySetted[$line->fk_product] = array();
+ }
+
+ $deliverableQty = min($quantityToBeDelivered, $stock);
+ }
+
+ if ($deliverableQty < 0) $deliverableQty = 0;
+
+ $tooltip = '';
+ if(!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])){
+ $tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtySetted[$line->fk_product][intval($warehouse_id)].'" ';
+ }
+
+ $alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = $deliverableQty + $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
+
+ $inputName = 'qtyl'.$indiceAsked.'_'.$subj;
+ if(GETPOSTISSET($inputName)){
+ $deliverableQty = GETPOST($inputName, 'int');
+ }
+
+ print '';
print '';
} else {
print $langs->trans("NA");
@@ -1366,6 +1416,12 @@ if ($action == 'create') {
$tmpwarehouseObject = new Entrepot($db);
$productlotObject = new Productlot($db);
+
+ uasort ( $product->stock_warehouse , function ($a, $b){
+ if ($a->real == $b->real) { return 0; }
+ return ($a->real < $b->real) ? -1 : 1;
+ });
+
// Define nb of lines suggested for this order line
$nbofsuggested = 0;
foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
@@ -1373,18 +1429,68 @@ if ($action == 'create') {
foreach ($stock_warehouse->detail_batch as $dbatch) {
$nbofsuggested++;
}
+
+ // Sort Batch priority
+ uasort($stock_warehouse->detail_batch, function ($a, $b) {
+ $compare = 0;
+ $multiplePow = 0;
+ // The comparison function must return an integer less than, equal to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second.
+
+ // PRIORITY FOR QTY : Eliminate place with small qty first
+ $multiplePow++;
+ $multiple = pow(10, $multiplePow);
+ $compare += (($a->qty < $b->qty) ? -1 : 1) * $multiple;
+
+ // PRIORITY FOR SELL EXPIRATION DATE
+ $multiplePow++;
+ $multiple = pow(10, $multiplePow);
+ $compare += (($a->sellby < $b->sellby) ? -1 : 1) * $multiple;
+
+ // PRIORITY FOR CONSUMPTION EXPIRATION DATE
+ $multiplePow++;
+ $multiple = pow(10, $multiplePow);
+ $compare += (($a->eatby < $b->eatby) ? -1 : 1) * $multiple;
+
+ return $compare;
+ });
}
}
+
foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
$tmpwarehouseObject->fetch($warehouse_id);
if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
foreach ($stock_warehouse->detail_batch as $dbatch) {
- //var_dump($dbatch);
+
$batchStock = + $dbatch->qty; // To get a numeric
- $deliverableQty = min($quantityToBeDelivered, $batchStock);
- if ($deliverableQty < 0) {
- $deliverableQty = 0;
+ if(isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])){
+ $deliverableQty = min($quantityToBeDelivered, $batchStock - $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)]);
}
+ else{
+ if(!isset($alreadyQtyBatchSetted[$line->fk_product])){
+ $alreadyQtyBatchSetted[$line->fk_product] = array();
+ }
+
+ if(!isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch])){
+ $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch] = array();
+ }
+
+ $deliverableQty = min($quantityToBeDelivered, $batchStock);
+ }
+
+ if ($deliverableQty < 0) $deliverableQty = 0;
+
+ $inputName = 'qtyl'.$indiceAsked.'_'.$subj;
+ if(GETPOSTISSET($inputName)){
+ $deliverableQty = GETPOST($inputName, 'int');
+ }
+
+ $tooltip = '';
+ if(!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])){
+ $tooltip = ' class="classfortooltip" title="'.$langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)].'" ';
+ }
+
+ $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
+
print ' |