Merged changes from main branch up to 2.1.3.
[fa-stable.git] / reporting / rep303.php
index f50361e5e4251b651b361628976fe848cd25068c..19be2ee92030cfad74174ec82f216ba87c04c4f7 100644 (file)
@@ -14,7 +14,7 @@ $page_security = 2;
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
 // date_:      2005-05-19
-// Title:      Stock Check
+// Title:      Stock Check Sheet
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -23,6 +23,7 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
+include_once($path_to_root . "/includes/db/manufacturing_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -45,7 +46,7 @@ function getTransactions($category, $location)
        if ($category != 0)
                $sql .= " AND ".TB_PREF."stock_master.category_id = '$category'";
        if ($location != 'all')
-               $sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'";
+               $sql .= " AND IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = '$location')";
        $sql .= " GROUP BY ".TB_PREF."stock_master.category_id,
                ".TB_PREF."stock_category.description,
                ".TB_PREF."stock_master.stock_id,
@@ -56,50 +57,6 @@ function getTransactions($category, $location)
     return db_query($sql,"No transactions were returned");
 }
 
-function getDemandQty($stockid, $location)
-{
-       $sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent) AS QtyDemand
-                               FROM ".TB_PREF."sales_order_details,
-                                       ".TB_PREF."sales_orders
-                               WHERE ".TB_PREF."sales_order_details.order_no=".TB_PREF."sales_orders.order_no AND ";
-       if ($location != "")
-               $sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND ";
-       $sql .= TB_PREF."sales_order_details.stk_code = '$stockid'";
-
-    $TransResult = db_query($sql,"No transactions were returned");
-       $DemandRow = db_fetch($TransResult);
-       return $DemandRow['QtyDemand'];
-}
-
-function getDemandAsmQty($stockid, $location)
-{
-       $sql = "SELECT SUM((".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent)*".TB_PREF."bom.quantity)
-                                  AS Dem
-                                  FROM ".TB_PREF."sales_order_details,
-                                               ".TB_PREF."sales_orders,
-                                               ".TB_PREF."bom,
-                                               ".TB_PREF."stock_master
-                                  WHERE ".TB_PREF."sales_order_details.stk_code=".TB_PREF."bom.parent AND
-                                  ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND ";
-       if ($location != "")
-               $sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND ";
-       $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
-                                  ".TB_PREF."bom.component='$stockid' AND
-                                  ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND
-                                  ".TB_PREF."stock_master.mb_flag='A'";
-
-    $TransResult = db_query($sql,"No transactions were returned");
-       if (db_num_rows($TransResult)==1)
-       {
-               $DemandRow = db_fetch_row($TransResult);
-               $DemandQty = $DemandRow[0];
-       }
-       else
-               $DemandQty = 0.0;
-
-    return $DemandQty;
-}
-
 //----------------------------------------------------------------------------------------------------
 
 function print_stock_check()
@@ -110,8 +67,9 @@ function print_stock_check()
     $location = $_POST['PARAM_1'];
     $pictures = $_POST['PARAM_2'];
     $check    = $_POST['PARAM_3'];
-    $comments = $_POST['PARAM_4'];
-       $destination = $_POST['PARAM_5'];
+    $shortage = $_POST['PARAM_4'];
+    $comments = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
@@ -130,24 +88,34 @@ function print_stock_check()
                $loc = _('All');
        else
                $loc = $location;
-
+       if ($shortage)
+       {
+               $short = _('Yes');
+               $available = _('Shortage');
+       }       
+       else
+       {
+               $short = _('No');
+               $available = _('Available');
+       }       
        if ($check)
        {
-               $cols = array(0, 100, 250, 305, 375, 445,       515);
-               $headers = array(_('Category'), _('Description'), _('Quantity'), _('Check'), _('Demand'), _('Difference'));
-               $aligns = array('left', 'left', 'right', 'right', 'right', 'right');
+               $cols = array(0, 100, 250, 295, 345, 390, 445,  515);
+               $headers = array(_('Stock ID'), _('Description'), _('Quantity'), _('Check'), _('Demand'), $available, _('On Order'));
+               $aligns = array('left', 'left', 'right', 'right', 'right', 'right', 'right');
        }
        else
        {
-               $cols = array(0, 100, 305, 375, 445,    515);
-               $headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Difference'));
-               $aligns = array('left', 'left', 'right', 'right', 'right');
+               $cols = array(0, 100, 250, 315, 380, 445,       515);
+               $headers = array(_('Stock ID'), _('Description'), _('Quantity'), _('Demand'), $available, _('On Order'));
+               $aligns = array('left', 'left', 'right', 'right', 'right', 'right');
        }
 
 
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
-                                   2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
+                                   2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''),
+                                   3 => array('text' => _('Only Shortage'), 'from' => $short, 'to' => ''));
 
        if ($pictures)
                $user_comp = user_company();
@@ -164,6 +132,16 @@ function print_stock_check()
        $catt = '';
        while ($trans=db_fetch($res))
        {
+               if ($location == 'all')
+                       $loc_code = "";
+               else
+                       $loc_code = $location;
+               $demandqty = get_demand_qty($trans['stock_id'], $loc_code);
+               $demandqty += get_demand_asm_qty($trans['stock_id'], $loc_code);
+               $onorder = get_on_porder_qty($trans['stock_id'], $loc_code);
+               $onorder += get_on_worder_qty($trans['stock_id'], $loc_code);
+               if ($shortage && $trans['QtyOnHand'] - $demandqty >= 0)
+                       continue;
                if ($catt != $trans['cat_description'])
                {
                        if ($catt != '')
@@ -176,12 +154,6 @@ function print_stock_check()
                        $catt = $trans['cat_description'];
                        $rep->NewLine();
                }
-               if ($location == 'all')
-                       $loc_code = "";
-               else
-                       $loc_code = $trans['loc_code'];
-               $demandqty = getDemandQty($trans['stock_id'], $loc_code);
-               $demandqty += getDemandAsmQty($trans['stock_id'], $loc_code);
                $rep->NewLine();
                $dec = get_qty_dec($trans['stock_id']);
                $rep->TextCol(0, 1, $trans['stock_id']);
@@ -192,11 +164,13 @@ function print_stock_check()
                        $rep->TextCol(3, 4, "_________");
                        $rep->AmountCol(4, 5, $demandqty, $dec);
                        $rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec);
+                       $rep->AmountCol(6, 7, $onorder, $dec);
                }
                else
                {
                        $rep->AmountCol(3, 4, $demandqty, $dec);
                        $rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec);
+                       $rep->AmountCol(5, 6, $onorder, $dec);
                }
                if ($pictures)
                {
@@ -218,4 +192,4 @@ function print_stock_check()
     $rep->End();
 }
 
-?>
\ No newline at end of file
+?>