X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep303.php;h=c984b3cb2fe679b4da45b345a98e1204f6e7f325;hb=c5ea8220cbcdc1c60fdf60d9a045ae3eada78041;hp=801561f197ddccba89e3108ff0e8a0cdc8ba3afa;hpb=7a50c189ea995d5fe6785feb7710c00396065d2b;p=fa-stable.git

diff --git a/reporting/rep303.php b/reporting/rep303.php
index 801561f1..c984b3cb 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -94,16 +94,15 @@ function getDemandAsmQty($stockid, $location)
 
 function print_stock_check()
 {
-    global $path_to_root, $pic_height, $pic_width;
+    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'];
-    $comments = $_POST['PARAM_3'];
-
-    $dec = user_qty_dec();
+    $check    = $_POST['PARAM_3'];
+    $comments = $_POST['PARAM_4'];
 
 	if ($category == reserved_words::get_all_numeric())
 		$category = 0;
@@ -119,11 +118,19 @@ function print_stock_check()
 	else
 		$loc = $location;
 
-	$cols = array(0, 100, 305, 375, 445,	515);
-
-	$headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Difference'));
+	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');
+	}
+	else
+	{
+		$cols = array(0, 100, 305, 375, 445,	515);
+		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Difference'));
+		$aligns = array('left',	'left',	'right', 'right', 'right');
+	}
 
-	$aligns = array('left',	'left',	'right', 'right', 'right');
 
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
@@ -159,18 +166,28 @@ function print_stock_check()
 		$demandqty = getDemandQty($trans['stock_id'], $trans['loc_code']);
 		$demandqty += getDemandAsmQty($trans['stock_id'], $trans['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->TextCol(3, 4, number_format2($demandqty, $dec));
-		$rep->TextCol(4, 5, number_format2($trans['QtyOnHand'] - $demandqty, $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));
+		}
+		else
+		{
+			$rep->TextCol(3, 4, number_format2($demandqty, $dec));
+			$rep->TextCol(4, 5, number_format2($trans['QtyOnHand'] - $demandqty, $dec));
+		}
 		if ($pictures)
 		{
-			$image = $path_to_root . "inventory/manage/image/" . $user_comp . "/" . $trans['stock_id'] . ".jpg";
+			$image = $comp_path .'/'. $user_comp . '/images/' . $trans['stock_id'] . '.jpg';
 			if (file_exists($image))
 			{
 				$rep->NewLine();
-				if ($rep->row - $height < $rep->bottomMargin)
+				if ($rep->row - $pic_height < $rep->bottomMargin)
 					$rep->Header();
 				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, $pic_width, $pic_height);
 				$rep->row -= $pic_height;