X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep307.php;h=18cfc6ea064852c614116de5700e5d9038f79164;hb=f01da91c553b7d256b053475c0f5dc026c47c10d;hp=214b5704feb62e353464d8aa5051d86524b7170b;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/reporting/rep307.php b/reporting/rep307.php
index 214b5704..18cfc6ea 100644
--- a/reporting/rep307.php
+++ b/reporting/rep307.php
@@ -37,7 +37,7 @@ function fetch_items($category=0)
 				units,
 				cat.description
 			FROM ".TB_PREF."stock_master stock LEFT JOIN ".TB_PREF."stock_category cat ON stock.category_id=cat.category_id
-				WHERE mb_flag <> 'D'";
+				WHERE mb_flag <> 'D' AND mb_flag <>'F'";
 		if ($category != 0)
 			$sql .= " AND cat.category_id = ".db_escape($category);
 		$sql .= " ORDER BY stock.category_id, stock_id";
@@ -104,14 +104,11 @@ function inventory_movements()
 	else
 		$cat = get_category_name($category);
 
-//	if ($location == ALL_TEXT)
-//		$location = '';
 	if ($location == '')
 		$loc = _('All');
 	else
 		$loc = get_location_name($location);
 
-	//$cols = array(0, 100, 300, 365, 440, 540, 640, 715);
 	$cols = array(0, 60, 220, 240, 310, 380, 450, 520);
 
 	$headers = array(_('Category'), _('Description'),	_('UOM'),	_('Opening'), _('Quantity In'), _('Quantity Out'), _('Balance'));
@@ -158,11 +155,11 @@ function inventory_movements()
 		$inward += trans_qty($myrow['stock_id'], $location, $from_date, $to_date);
 		$outward += trans_qty($myrow['stock_id'], $location, $from_date, $to_date, false);
 
-		$rep->AmountCol(3, 4, $qoh_start, get_qty_dec($myrow['stock_id']));
-		$rep->AmountCol(4, 5, $inward, get_qty_dec($myrow['stock_id']));
-		$rep->AmountCol(5, 6, $outward, get_qty_dec($myrow['stock_id']));
-		$rep->AmountCol(6, 7, $qoh_end, get_qty_dec($myrow['stock_id']));
-		
+		$stock_qty_dec = get_qty_dec($myrow['stock_id']);
+		$rep->AmountCol(3, 4, $qoh_start, $stock_qty_dec);
+		$rep->AmountCol(4, 5, $inward, $stock_qty_dec);
+		$rep->AmountCol(5, 6, $outward, $stock_qty_dec);
+		$rep->AmountCol(6, 7, $qoh_end, $stock_qty_dec);
 		$rep->NewLine(0, 1);
 	}
 	$rep->Line($rep->row  - 4);