From f14d54f1294a8120fafc54bfb99d32cdcecb32a0 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Fri, 21 Nov 2014 10:18:42 +0100 Subject: [PATCH] [0002950] Fixed false quantity on hand errors on sales delivery. --- sales/customer_delivery.php | 2 +- sales/includes/cart_class.inc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 36dc0b49..3c3c1800 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -434,7 +434,7 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { // (but anyway dispatch is checked again later before transaction is saved) $qty = $ln_itm->qty_dispatched; - if ($check = check_negative_stock($ln_itm->stock_id, -$ln_itm->qty_dispatched, $_POST['Location'], $_POST['DispatchDate'])) + if ($check = check_negative_stock($ln_itm->stock_id, $ln_itm->qty_done-$ln_itm->qty_dispatched, $_POST['Location'], $_POST['DispatchDate'])) $qty = $check['qty']; $q_class = hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qty); diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc index e39ebf99..a363562e 100644 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@ -563,12 +563,13 @@ class cart if (has_stock_holding($line_item->mb_flag)) { if (!$this->trans_no) // new delivery - $qtys[$line_item->stock_id]['qty'] = $line_item->quantity + @$qtys[$line_item->stock_id]['qty']; + $qtys[$line_item->stock_id]['qty'] = $line_item->qty_dispatched + @$qtys[$line_item->stock_id]['qty']; else // DN modification: check change in quantity - $qtys[$line_item->stock_id]['qty'] = ($line_item->qty_dispatched-$line_item->quantity) + @$qtys[$line_item->stock_id]['qty']; + $qtys[$line_item->stock_id]['qty'] = ($line_item->qty_dispatched-$line_item->qty_old) + @$qtys[$line_item->stock_id]['qty']; $qtys[$line_item->stock_id]['line'] = $line_no; } } + foreach($qtys as $stock_id => $sum) { if (check_negative_stock($stock_id, -$sum['qty'], $location ? $location : $this->Location, $date ? $date : $this->document_date)) -- 2.30.2