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

diff --git a/reporting/rep303.php b/reporting/rep303.php
index bc04f769..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)
@@ -98,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;
@@ -143,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);
@@ -175,17 +186,17 @@ function print_stock_check()
 		$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)
 		{
@@ -202,6 +213,7 @@ function print_stock_check()
 		}
 	}
 	$rep->Line($rep->row - 4);
+	$rep->NewLine();
     $rep->End();
 }