Moving 2.0 development version to main trunk.

[fa-stable.git] / inventory / inquiry / stock_status.php

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 9b16d753396a44c634f5771061adcbce1292540a..ae0764567c14fbde263f5cf1f7caa619755d4cbf 100644 (file)
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -18,6 +18,8 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
+if (isset($_POST['_stock_id_update']))
+       $Ajax->activate('status_tbl');
 //----------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -31,7 +33,7 @@ echo "<center> " . _("Item:"). " ";
 stock_items_list('stock_id', $_POST['stock_id'], false, true);
 echo "<br>";
 
-echo "<hr>";
+echo "<hr></center>";
 
 set_global_stock_item($_POST['stock_id']);
 
@@ -46,31 +48,33 @@ if (is_service($mb_flag))
 
 $loc_details = get_loc_details($_POST['stock_id']);
 
+div_start('status_tbl');
 start_table($table_style);
 
 if ($kitset_or_service == true)
 {
        $th = array(_("Location"), _("Demand"));
-} 
-else 
+}
+else
 {
        $th = array(_("Location"), _("Quantity On Hand"), _("Re-Order Level"),
                _("Demand"), _("Available"), _("On Order"));
 }
 table_header($th);
+$dec = get_qty_dec($_POST['stock_id']);
 $j = 1;
 $k = 0; //row colour counter
 
-while ($myrow = db_fetch($loc_details)) 
+while ($myrow = db_fetch($loc_details))
 {
 
        alt_table_row_color($k);
 
-       $sql = "SELECT Sum(".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_invoiced) AS DEM
+       $sql = "SELECT Sum(".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent) AS DEM
                FROM ".TB_PREF."sales_order_details, ".TB_PREF."sales_orders
                WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
                AND ".TB_PREF."sales_orders.from_stk_loc='" . $myrow["loc_code"] . "'
-               AND ".TB_PREF."sales_order_details.qty_invoiced < ".TB_PREF."sales_order_details.quantity
+               AND ".TB_PREF."sales_order_details.qty_sent < ".TB_PREF."sales_order_details.quantity
                AND ".TB_PREF."sales_order_details.stk_code='" . $_POST['stock_id'] . "'";
 
        $demand_result = db_query($sql,"Could not retreive demand for item");
@@ -79,8 +83,8 @@ while ($myrow = db_fetch($loc_details))
        {
          $demand_row = db_fetch_row($demand_result);
          $demand_qty =  $demand_row[0];
-       } 
-       else 
+       }
+       else
        {
          $demand_qty =0;
        }
@@ -100,39 +104,39 @@ while ($myrow = db_fetch($loc_details))
                {
                $qoo_row = db_fetch_row($qoo_result);
                $qoo =  $qoo_row[0];
-               } 
-               else 
+               }
+               else
                {
                        $qoo = 0;
                }
 
                label_cell($myrow["location_name"]);
-               qty_cell($qoh);
-        qty_cell($myrow["reorder_level"]);
-        qty_cell($demand_qty);
-        qty_cell($qoh - $demand_qty);
-        qty_cell($qoo);
+               qty_cell($qoh, false, $dec);
+        qty_cell($myrow["reorder_level"], false, $dec);
+        qty_cell($demand_qty, false, $dec);
+        qty_cell($qoh - $demand_qty, false, $dec);
+        qty_cell($qoo, false, $dec);
         end_row();
 
-       } 
-       else 
+       }
+       else
        {
        /* It must be a service or kitset part */
                label_cell($myrow["location_name"]);
-               qty_cell($demand_qty);
+               qty_cell($demand_qty, false, $dec);
                end_row();
 
        }
        $j++;
        If ($j == 12)
        {
-               $j = 1; 
+               $j = 1;
                table_header($th);
        }
 }
 
 end_table();
-
+div_end();
 end_form();
 end_page();