X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;h=30cc9ac947d8826fca08568a08c2b49738646a79;hb=161bba0a7475c63af6951cb1fc465747926f51bf;hp=9d2b83bae24da5a40723db8748892bbb91f142ae;hpb=01dd975d5588641f9b56ae26bd112d4d9ba31783;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index 9d2b83ba..30cc9ac9 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -36,7 +36,9 @@ function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty)
 		if ($myrow['type'] == ST_SUPPRECEIVE)
 		{
 			// Has the supplier invoice increased the receival price?
-			$sql = "SELECT DISTINCT act_price FROM ".TB_PREF."purch_order_details pod INNER JOIN ".TB_PREF."grn_batch grn ON pod.order_no =
+			$sql = "SELECT DISTINCT act_price 
+				FROM ".TB_PREF."purch_order_details pod
+					INNER JOIN ".TB_PREF."grn_batch grn ON pod.order_no =
 				grn.purch_order_no WHERE grn.id = ".$myrow['trans_no']." AND pod.item_code = '$stock_id'";
 			$result = db_query($sql, "Could not retrieve act_price from purch_order_details");
 			$row = db_fetch_row($result);
@@ -66,7 +68,7 @@ function getAverageCost($stock_id, $to_date)
 
 	$to_date = date2sql($to_date);
 
-	$sql = "SELECT standard_cost, price, tran_date, type, trans_no, qty, person_id FROM ".TB_PREF."stock_moves
+	$sql = "SELECT standard_cost, qty FROM ".TB_PREF."stock_moves
 		WHERE stock_id=".db_escape($stock_id)."
 		AND tran_date <= '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND type <> ".ST_LOCTRANSFER;
 
@@ -91,40 +93,41 @@ function getAverageCost($stock_id, $to_date)
 		return 0;
 	return $tot_cost / $count;
 }
-    
+
 function getTransactions($category, $location, $date)
 {
 	$date = date2sql($date);
-	
-	$sql = "SELECT ".TB_PREF."stock_master.category_id,
-			".TB_PREF."stock_category.description AS cat_description,
-			".TB_PREF."stock_master.stock_id,
-			".TB_PREF."stock_master.units,
-			".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive,
-			".TB_PREF."stock_moves.loc_code,
-			SUM(".TB_PREF."stock_moves.qty) AS QtyOnHand, 
-			".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost AS UnitCost,
-			SUM(".TB_PREF."stock_moves.qty) *(".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost) AS ItemTotal 
-			FROM ".TB_PREF."stock_master,
-			".TB_PREF."stock_category,
-			".TB_PREF."stock_moves
-		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id
-		AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-		AND ".TB_PREF."stock_master.mb_flag<>'D' 
-		AND ".TB_PREF."stock_moves.tran_date <= '$date'
-		GROUP BY ".TB_PREF."stock_master.category_id,
-			".TB_PREF."stock_category.description, ";
+
+	$sql = "SELECT item.category_id,
+			category.description AS cat_description,
+			item.stock_id,
+			item.units,
+			item.description, item.inactive,
+			move.loc_code,
+			SUM(move.qty) AS QtyOnHand, 
+			item.material_cost AS UnitCost,
+			SUM(move.qty) * item.material_cost AS ItemTotal 
+			FROM "
+			.TB_PREF."stock_master item,"
+			.TB_PREF."stock_category category,"
+			.TB_PREF."stock_moves move
+		WHERE item.stock_id=move.stock_id
+		AND item.category_id=category.category_id
+		AND item.mb_flag<>'D' AND mb_flag <> 'F' 
+		AND move.tran_date <= '$date'
+		GROUP BY item.category_id,
+			category.description, ";
 		if ($location != 'all')
-			$sql .= TB_PREF."stock_moves.loc_code, ";
-		$sql .= TB_PREF."stock_master.stock_id,
-			".TB_PREF."stock_master.description
-		HAVING SUM(".TB_PREF."stock_moves.qty) != 0";
+			$sql .= "move.loc_code, ";
+		$sql .= "item.stock_id,
+			item.description
+		HAVING SUM(move.qty) != 0";
 		if ($category != 0)
-			$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
+			$sql .= " AND item.category_id = ".db_escape($category);
 		if ($location != 'all')
-			$sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
-		$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
-			".TB_PREF."stock_master.stock_id";
+			$sql .= " AND move.loc_code = ".db_escape($location);
+		$sql .= " ORDER BY item.category_id,
+			item.stock_id";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -133,7 +136,7 @@ function getTransactions($category, $location, $date)
 
 function print_inventory_valuation_report()
 {
-    global $path_to_root, $use_costed_values;;
+    global $path_to_root, $SysPrefs;
 
 	$date = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
@@ -211,7 +214,7 @@ function print_inventory_valuation_report()
 			if ($detail)
 				$rep->NewLine();
 		}
-		if (isset($use_costed_values) && $use_costed_values==1)
+		if (isset($SysPrefs->use_costed_values) && $SysPrefs->use_costed_values==1)
 		{
 			$UnitCost = getAverageCost($trans['stock_id'], $date);
 			$ItemTotal = $trans['QtyOnHand'] * $UnitCost;
@@ -258,4 +261,3 @@ function print_inventory_valuation_report()
     $rep->End();
 }
 
-?>
\ No newline at end of file