X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep307.php;h=d9d9c29e29d27b464c30e853d27ef87234b87089;hb=ab24fcc549bb72e495fb85e5dcad41bc14d85b7d;hp=19db40997a4ba6b9485a043a695be1afe9548f91;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/reporting/rep307.php b/reporting/rep307.php
index 19db4099..d9d9c29e 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";
@@ -45,7 +45,7 @@ function fetch_items($category=0)
     return db_query($sql,"No transactions were returned");
 }
 
-function trans_qty($stock_id, $location=null, $from_date, $to_date, $inward = true)
+function trans_qty($stock_id, $location, $from_date, $to_date, $inward = true)
 {
 	if ($from_date == null)
 		$from_date = Today();
@@ -155,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);