X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep303.php;h=b46e1d817ed714ff1a6f1ca01b448768c26595a9;hb=d567a10b7925c8bb97c734e213d6651a979af29d;hp=c984b3cb2fe679b4da45b345a98e1204f6e7f325;hpb=e1618d697e9b150556b9b11e453fac1e91b5b8f4;p=fa-stable.git

diff --git a/reporting/rep303.php b/reporting/rep303.php
index c984b3cb..b46e1d81 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
@@ -7,17 +16,16 @@ $page_security = 2;
 // date_:	2005-05-19
 // Title:	Stock Check
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-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/db/items_category_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+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/db/items_category_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_stock_check();
 
 function getTransactions($category, $location)
@@ -26,13 +34,13 @@ function getTransactions($category, $location)
 			".TB_PREF."stock_category.description AS cat_description,
 			".TB_PREF."stock_master.stock_id,
 			".TB_PREF."stock_master.description,
-			".TB_PREF."stock_moves.loc_code,
-			SUM(".TB_PREF."stock_moves.qty) AS QtyOnHand
-		FROM ".TB_PREF."stock_master,
-			".TB_PREF."stock_category,
-			".TB_PREF."stock_moves
-		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id
-		AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
+			IF(".TB_PREF."stock_moves.stock_id IS NULL, '', ".TB_PREF."stock_moves.loc_code) AS loc_code,
+			SUM(IF(".TB_PREF."stock_moves.stock_id IS NULL,0,".TB_PREF."stock_moves.qty)) AS QtyOnHand
+		FROM (".TB_PREF."stock_master,
+			".TB_PREF."stock_category)
+		LEFT JOIN ".TB_PREF."stock_moves ON
+			(".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id OR ".TB_PREF."stock_master.stock_id IS NULL)
+		WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
 		AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
 	if ($category != 0)
 		$sql .= " AND ".TB_PREF."stock_master.category_id = '$category'";
@@ -53,9 +61,10 @@ 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
-					".TB_PREF."sales_orders.from_stk_loc ='$location' AND
-					".TB_PREF."sales_order_details.stk_code = '$stockid'";
+				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);
@@ -71,9 +80,10 @@ function getDemandAsmQty($stockid, $location)
 						".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
-				   ".TB_PREF."sales_orders.from_stk_loc='$location' AND
-				   ".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 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'";
@@ -96,13 +106,16 @@ function print_stock_check()
 {
     global $comp_path, $path_to_root, $pic_height, $pic_width;
 
-    include_once($path_to_root . "reporting/includes/pdf_report.inc");
-
     $category = $_POST['PARAM_0'];
     $location = $_POST['PARAM_1'];
     $pictures = $_POST['PARAM_2'];
     $check    = $_POST['PARAM_3'];
     $comments = $_POST['PARAM_4'];
+	$destination = $_POST['PARAM_5'];
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	if ($category == reserved_words::get_all_numeric())
 		$category = 0;
@@ -141,7 +154,7 @@ function print_stock_check()
 	else
 		$user_comp = "";
 
-    $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet.pdf", user_pagesize());
+    $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -163,23 +176,27 @@ function print_stock_check()
 			$catt = $trans['cat_description'];
 			$rep->NewLine();
 		}
-		$demandqty = getDemandQty($trans['stock_id'], $trans['loc_code']);
-		$demandqty += getDemandAsmQty($trans['stock_id'], $trans['loc_code']);
+		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']);
 		$rep->TextCol(1, 2, $trans['description']);
-		$rep->TextCol(2, 3, number_format2($trans['QtyOnHand'], $dec));
+		$rep->AmountCol(2, 3, $trans['QtyOnHand'], $dec);
 		if ($check)
 		{
 			$rep->TextCol(3, 4, "_________");
-			$rep->TextCol(4, 5, number_format2($demandqty, $dec));
-			$rep->TextCol(5, 6, number_format2($trans['QtyOnHand'] - $demandqty, $dec));
+			$rep->AmountCol(4, 5, $demandqty, $dec);
+			$rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec);
 		}
 		else
 		{
-			$rep->TextCol(3, 4, number_format2($demandqty, $dec));
-			$rep->TextCol(4, 5, number_format2($trans['QtyOnHand'] - $demandqty, $dec));
+			$rep->AmountCol(3, 4, $demandqty, $dec);
+			$rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec);
 		}
 		if ($pictures)
 		{
@@ -196,6 +213,7 @@ function print_stock_check()
 		}
 	}
 	$rep->Line($rep->row - 4);
+	$rep->NewLine();
     $rep->End();
 }