X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep303.php;h=f50361e5e4251b651b361628976fe848cd25068c;hb=34f8e554ed5ac52648b5a542f02b39b6c6e3fc46;hp=285dd7269ca768b43adc448e867975fc546ff4ac;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/reporting/rep303.php b/reporting/rep303.php
index 285dd726..f50361e5 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -22,11 +22,10 @@ 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 . "/inventory/includes/inventory_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_stock_check();
 
 function getTransactions($category, $location)
@@ -107,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;
@@ -152,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);
@@ -184,33 +186,35 @@ 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)
 		{
-			$image = $comp_path .'/'. $user_comp . '/images/' . $trans['stock_id'] . '.jpg';
+			$image = $comp_path .'/'. $user_comp . '/images/' 
+				. item_img_name($trans['stock_id']) . '.jpg';
 			if (file_exists($image))
 			{
 				$rep->NewLine();
 				if ($rep->row - $pic_height < $rep->bottomMargin)
 					$rep->Header();
-				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, $pic_width, $pic_height);
+				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
 				$rep->row -= $pic_height;
 				$rep->NewLine();
 			}
 		}
 	}
 	$rep->Line($rep->row - 4);
+	$rep->NewLine();
     $rep->End();
 }