X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep303.php;h=19be2ee92030cfad74174ec82f216ba87c04c4f7;hb=e6b2ed7a578d4d1bc8187a71519f6c5d10b11be9;hp=20e2d17ea86be309ec2730d0430f0a344e78f172;hpb=e2e70306f9d9d99d25bb26f0e93e06a3a873606c;p=fa-stable.git

diff --git a/reporting/rep303.php b/reporting/rep303.php
index 20e2d17e..19be2ee9 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -46,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,
@@ -67,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
@@ -87,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, 295, 345, 390, 445,	515);
-		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Check'), _('Demand'), _('Shortage'), _('On Order'));
+		$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, 250, 315, 380, 445,	515);
-		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Shortage'), _('On Order'));
+		$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();
@@ -121,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 != '')
@@ -133,14 +154,6 @@ function print_stock_check()
 			$catt = $trans['cat_description'];
 			$rep->NewLine();
 		}
-		if ($location == 'all')
-			$loc_code = "";
-		else
-			$loc_code = $trans['loc_code'];
-		$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);
 		$rep->NewLine();
 		$dec = get_qty_dec($trans['stock_id']);
 		$rep->TextCol(0, 1, $trans['stock_id']);
@@ -179,4 +192,4 @@ function print_stock_check()
     $rep->End();
 }
 
-?>
\ No newline at end of file
+?>