X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep308.php;h=0981c2ad64276153b9e67943192ad18a9e34547a;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=e0286c63bc31e3f90cc6cf7040dd3d11a059fced;hpb=9145f42a983ab1e8119092c1bb225c060e29e97a;p=fa-stable.git

diff --git a/reporting/rep308.php b/reporting/rep308.php
index e0286c63..0981c2ad 100644
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -11,10 +11,10 @@
 ***********************************************************************/
 $page_security = 'SA_ITEMSVALREP';
 // ----------------------------------------------------------------
-// $ Revision:	2.0 $
-// Creator:	Jujuk, Joe Hunt
-// date_:	2011-05-24
-// Title:	Stock Movements
+// $ Revision:	2.4 $
+// Creator:		boxygen, Joe Hunt
+// date_:		2017-05-14
+// Title:		Costed Inventory Movements
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -30,13 +30,33 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
 inventory_movements();
 
+function get_domestic_price($myrow, $stock_id)
+{
+    if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
+     {
+        $price = $myrow['price'];
+        if ($myrow['person_id'] > 0)
+        {
+            // Do we have foreign currency?
+            $supp = get_supplier($myrow['person_id']);
+            $currency = $supp['curr_code'];
+            $ex_rate = $myrow['ex_rate'];
+            $price *= $ex_rate;
+        }
+    }
+    else
+        $price = $myrow['standard_cost']; //pick standard_cost for sales deliveries
+
+    return $price;
+}
+
 function fetch_items($category=0)
 {
 		$sql = "SELECT stock_id, stock.description AS name,
 				stock.category_id,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";
@@ -59,7 +79,7 @@ function trans_qty($stock_id, $location=null, $from_date, $to_date, $inward = tr
 	$sql = "SELECT ".($inward ? '' : '-')."SUM(qty) FROM ".TB_PREF."stock_moves
 		WHERE stock_id=".db_escape($stock_id)."
 		AND tran_date >= '$from_date' 
-		AND tran_date <= '$to_date'";
+		AND tran_date <= '$to_date' AND type <> ".ST_LOCTRANSFER;
 
 	if ($location != '')
 		$sql .= " AND loc_code = ".db_escape($location);
@@ -84,19 +104,37 @@ function avg_unit_cost($stock_id, $location=null, $to_date)
 
 	$to_date = date2sql($to_date);
 
-	$sql = "SELECT AVG (standard_cost)   FROM ".TB_PREF."stock_moves
-		WHERE stock_id=".db_escape($stock_id)."
-		AND tran_date < '$to_date'";
+  	$sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate
+  		FROM ".TB_PREF."stock_moves move
+				LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+				LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+				LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id
+				LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type
+				LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no
+			WHERE stock_id=".db_escape($stock_id)."
+			AND move.tran_date < '$to_date' AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
 	if ($location != '')
-		$sql .= " AND loc_code = ".db_escape($location);
+		$sql .= " AND move.loc_code = ".db_escape($location);
 
-	$result = db_query($sql, "QOH calculation failed");
+	$sql .= " ORDER BY tran_date";	
 
-	$myrow = db_fetch_row($result);	
+	$result = db_query($sql, "No standard cost transactions were returned");
 
-	return $myrow[0];
+    if ($result == false)
+    	return 0;
 
+	$qty = $tot_cost = 0;
+	while ($row=db_fetch($result))
+	{
+		$qty += $row['qty'];	
+		$price = get_domestic_price($row, $stock_id);
+        $tran_cost = $price * $row['qty'];
+        $tot_cost += $tran_cost;
+	}
+	if ($qty == 0)
+		return 0;
+	return $tot_cost / $qty;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -113,25 +151,41 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i
 
 	$to_date = date2sql($to_date);
 
-	$sql = "SELECT AVG (standard_cost)   FROM ".TB_PREF."stock_moves
+  	$sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate
+  		FROM ".TB_PREF."stock_moves move
+				LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+				LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+				LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id
+				LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type
+				LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no
 		WHERE stock_id=".db_escape($stock_id)."
-		AND tran_date >= '$from_date' 
-		AND tran_date <= '$to_date'";
+		AND move.tran_date >= '$from_date' AND move.tran_date <= '$to_date' AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
 	if ($location != '')
-		$sql .= " AND loc_code = ".db_escape($location);
+		$sql .= " AND move.loc_code = ".db_escape($location);
 
 	if ($inward)
 		$sql .= " AND qty > 0 ";
 	else
 		$sql .= " AND qty < 0 ";
-
-	$result = db_query($sql, "QOH calculation failed");
-
-	$myrow = db_fetch_row($result);	
-
-	return $myrow[0];
-
+	$sql .= " ORDER BY tran_date";
+	
+	$result = db_query($sql, "No standard cost transactions were returned");
+    
+    if ($result == false)
+    	return 0;
+	
+	$qty = $tot_cost = 0;
+	while ($row=db_fetch($result))
+	{
+        $qty += $row['qty'];
+        $price = get_domestic_price($row, $stock_id); 
+        $tran_cost = $row['qty'] * $price;
+        $tot_cost += $tran_cost;
+	}	
+	if ($qty == 0)
+		return 0;
+	return $tot_cost / $qty;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -165,7 +219,7 @@ function inventory_movements()
 	else
 		$loc = get_location_name($location);
 
-	$cols = array(0, 60, 130, 160, 185, 215, 250, 275, 305, 340, 365, 395, 430, 455, 485, 520);
+	$cols = array(0, 60, 134, 160, 185, 215, 250, 275, 305, 340, 365, 395, 430, 455, 485, 520);
 
 	$headers = array(_('Category'), _('Description'),	_('UOM'), '', '', _('OpeningStock'), '', '',_('StockIn'), '', '', _('Delivery'), '', '', _('ClosingStock'));
 	$headers2 = array("", "", "", _("QTY"), _("Rate"), _("Value"), _("QTY"), _("Rate"), _("Value"), _("QTY"), _("Rate"), _("Value"), _("QTY"), _("Rate"), _("Value"));
@@ -201,11 +255,6 @@ function inventory_movements()
 			$rep->fontSize -= 2;
 			$rep->NewLine();
 		}
-		$rep->NewLine();
-		$rep->TextCol(0, 1,	$myrow['stock_id']);
-		$rep->TextCol(1, 2, $myrow['name']);
-		$rep->TextCol(2, 3, $myrow['units']);
-		
 		$qoh_start = get_qoh_on_date($myrow['stock_id'], $location, add_days($from_date, -1));
 		$qoh_end = get_qoh_on_date($myrow['stock_id'], $location, $to_date);
 		
@@ -213,6 +262,12 @@ function inventory_movements()
 		$outward = trans_qty($myrow['stock_id'], $location, $from_date, $to_date, false);
 		$openCost = avg_unit_cost($myrow['stock_id'], $location, $from_date);
 		$unitCost = avg_unit_cost($myrow['stock_id'], $location, add_days($to_date, 1));
+		if ($qoh_start == 0 && $inward == 0 && $outward == 0 && $qoh_end == 0)
+			continue;
+		$rep->NewLine();
+		$rep->TextCol(0, 1,	$myrow['stock_id']);
+		$rep->TextCol(1, 2, substr($myrow['name'], 0, 24) . ' ');
+		$rep->TextCol(2, 3, $myrow['units']);
 		$rep->AmountCol(3, 4, $qoh_start, get_qty_dec($myrow['stock_id']));
 		$rep->AmountCol(4, 5, $openCost, $dec);
 		$openCost *= $qoh_start;
@@ -247,14 +302,16 @@ function inventory_movements()
 	}
 	$rep->Line($rep->row  - 4);
 	$rep->NewLine(2);
-	$rep->TextCol(0, 1,	_("Total"));
+	$rep->TextCol(0, 1,	_("Total Movement"));
 	$rep->AmountCol(5, 6, $totval_open);
 	$rep->AmountCol(8, 9, $totval_in);
 	$rep->AmountCol(11, 12, $totval_out);
+	$rep->AmountCol(14, 15, $totval_open + $totval_in - $totval_out);
+	$rep->NewLine(1);
+	$rep->TextCol(0, 1,	_("Total Out"));
 	$rep->AmountCol(14, 15, $totval_close);
 	$rep->Line($rep->row  - 4);
 
     $rep->End();
 }
 
-?>
\ No newline at end of file