X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;fp=reporting%2Frep301.php;h=9d2b83bae24da5a40723db8748892bbb91f142ae;hb=01dd975d5588641f9b56ae26bd112d4d9ba31783;hp=5ad1735cb31cb5d2630ca1a0207ce6b4d79a775f;hpb=84ebe8b3ebc1fc3e6508d75a4f39ce4a868b0b14;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index 5ad1735c..9d2b83ba 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -28,19 +28,84 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 
 print_inventory_valuation_report();
 
+function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty)
+{
+	if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
+	{
+		$price = $myrow['price'];
+		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 =
+				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);
+			if ($row[0] > 0 AND $row[0] <> $myrow['price'])
+				$price = $row[0];
+		}
+		if ($myrow['person_id'] > 0)
+		{
+			// Do we have foreign currency?
+			$supp = get_supplier($myrow['person_id']);
+			$currency = $supp['curr_code'];
+			$ex_rate = get_exchange_rate_to_home_currency($currency, sql2date($myrow['tran_date']));
+			$price /= $ex_rate;
+		}	
+	}
+	elseif ($myrow['type'] != ST_INVADJUST) // calcutale the price from avg. price
+		$price = ($myrow['standard_cost'] * $qty - $old_std_cost * $old_qty) / $myrow['qty'];
+	else
+		$price = $myrow['standard_cost']; // Item Adjustments just have the real cost
+	return $price;
+}	
+
+function getAverageCost($stock_id, $to_date)
+{
+	if ($to_date == null)
+		$to_date = Today();
+
+	$to_date = date2sql($to_date);
+
+	$sql = "SELECT standard_cost, price, tran_date, type, trans_no, qty, person_id 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;
+
+	$sql .= " ORDER BY tran_date";	
+
+	$result = db_query($sql, "No standard cost transactions were returned");
+    if ($result == false)
+    	return 0;
+	$qty = $old_qty = $count = $old_std_cost = $tot_cost = 0;
+	while ($row=db_fetch($result))
+	{
+		$qty += $row['qty'];	
+
+		$price = get_domestic_price($row, $stock_id, $qty, $old_std_cost, $old_qty);
+
+		$old_std_cost = $row['standard_cost'];
+		$tot_cost += $price;
+		$count++;
+		$old_qty = $qty;
+	}
+	if ($count == 0)
+		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,
+			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,
+			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
@@ -51,8 +116,7 @@ function getTransactions($category, $location, $date)
 			".TB_PREF."stock_category.description, ";
 		if ($location != 'all')
 			$sql .= TB_PREF."stock_moves.loc_code, ";
-		$sql .= "UnitCost,
-			".TB_PREF."stock_master.stock_id,
+		$sql .= TB_PREF."stock_master.stock_id,
 			".TB_PREF."stock_master.description
 		HAVING SUM(".TB_PREF."stock_moves.qty) != 0";
 		if ($category != 0)
@@ -69,7 +133,7 @@ function getTransactions($category, $location, $date)
 
 function print_inventory_valuation_report()
 {
-    global $path_to_root;
+    global $path_to_root, $use_costed_values;;
 
 	$date = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
@@ -147,6 +211,16 @@ function print_inventory_valuation_report()
 			if ($detail)
 				$rep->NewLine();
 		}
+		if (isset($use_costed_values) && $use_costed_values==1)
+		{
+			$UnitCost = getAverageCost($trans['stock_id'], $date);
+			$ItemTotal = $trans['QtyOnHand'] * $UnitCost;
+		}	
+		else
+		{
+			$UnitCost = $trans['UnitCost'];
+			$ItemTotal = $trans['ItemTotal'];
+		}	
 		if ($detail)
 		{
 			$rep->NewLine();
@@ -155,14 +229,15 @@ function print_inventory_valuation_report()
 			$rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
 			$rep->TextCol(2, 3, $trans['units']);
 			$rep->AmountCol(3, 4, $trans['QtyOnHand'], get_qty_dec($trans['stock_id']));
+			
 			$dec2 = 0;
-			price_decimal_format($trans['UnitCost'], $dec2);
-			$rep->AmountCol(4, 5, $trans['UnitCost'], $dec2);
-			$rep->AmountCol(5, 6, $trans['ItemTotal'], $dec);
+			price_decimal_format($UnitCost, $dec2);
+			$rep->AmountCol(4, 5, $UnitCost, $dec2);
+			$rep->AmountCol(5, 6, $ItemTotal, $dec);
 			$rep->fontSize += 2;
 		}
-		$total += $trans['ItemTotal'];
-		$grandtotal += $trans['ItemTotal'];
+		$total += $ItemTotal;
+		$grandtotal += $ItemTotal;
 	}
 	if ($detail)
 	{