Display available quantity in order line view (for customer)

diff --git a/includes/order_lines.inc b/includes/order_lines.inc
index 52d315de4b1c84d41cf8262ba28c2294bfb07324..5f8d922cbe8458fc0ed226acb81861ab995751d9 100644 (file)
--- a/includes/order_lines.inc
+++ b/includes/order_lines.inc
@@ -133,11 +133,13 @@ $row_id = $row['id'];
 ";
 }
 
-function get_order_details_extra($customer_id) {
+function get_order_details_extra($customer_id, $location) {
        $sql = "SELECT sod.id
        , so.order_no
        , stk_code
-       , quantity - qty_sent
+       , sod.quantity - qty_sent
+       , GREATEST(0, LEAST(qoh.quantity  - quantity_before, sod.quantity - qty_sent))
+       , quantity_before
        , required_date
        ,comment
        FROM ".TB_PREF."sales_order_details sod
@@ -146,7 +148,9 @@ function get_order_details_extra($customer_id) {
                AND so.trans_type = ".ST_SALESORDER."
                AND so.debtor_no = $customer_id
        )
-       WHERE quantity > qty_sent
+       JOIN ".TB_PREF."denorm_qoh qoh ON (stock_id = stk_code AND loc_code = '$location')
+       JOIN ".TB_PREF."denorm_order_details_queue  d ON (d.id = sod.id)
+       WHERE sod.quantity > qty_sent
        ";
 
        return $sql;

diff --git a/order_lines_view.php b/order_lines_view.php
index 5f2e5b837f154e7690b6526683a263ab7adbdb53..e1366261e62fa2702f57fd929e3563a3ca40c94d 100644 (file)
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -68,12 +68,13 @@ end_table(1);
 //     Orders inquiry table
 //
 if($customer_id) {
-       $sql = get_order_details_extra($customer_id);
+       $sql = get_order_details_extra($customer_id, 'DEF');
        $cols = array(
                'detail_id' => 'skip'
                ,       _("Order #") => array('fun'=>'view_link', 'ord' => '')
                ,_("Item Code") => array('ord' => '', 'fun' => 'item_link')
                ,_("Quantity") => array('type' => 'qty', 'dec' => 0)
+               ,_("Available") => array('type' => 'qty', 'dec' => 0, 'ord' => '')
        ,_("Required Date") => array('fun' => 'input_date_details', 'ord' => '')
        ,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '')
        );