X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;h=5d04754bc85286030f305c890bbfbdd0dadbfadb;hb=b0de7973950dd3f665839600b20141461c624614;hp=df3ee002d62d1bc1aa8718e21fc1194f7d124ca8;hpb=62c48a4e71294c51defb624ed9b921aee7904e1b;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index df3ee002..5d04754b 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -11,10 +11,10 @@
 ***********************************************************************/
 $page_security = 'SA_ITEMSVALREP';
 // ----------------------------------------------------------------
-// $ Revision:  2.3 $
-// Creator:    	Joe Hunt, boxygen
-// date_:    	2017-05-13
-// Title:    	Inventory Valuation
+// $ Revision:	2.4 $
+// Creator:		Joe Hunt, boxygen
+// date_:		2014-05-13
+// Title:		Inventory Valuation
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -23,210 +23,237 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
+
 //----------------------------------------------------------------------------------------------------
+
 print_inventory_valuation_report();
 
 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 = get_exchange_rate_to_home_currency($currency, sql2date($myrow['tran_date']));
-            $price /= $ex_rate;
+            $ex_rate = $myrow['ex_rate'];
+            $price *= $ex_rate;
         }
     }
     else
-        $price = $myrow['standard_cost']; // Item Adjustments just have the real cost
+        $price = $myrow['standard_cost']; //pick standard_cost for sales deliveries
+
     return $price;
 }
 
 function getAverageCost($stock_id, $location, $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;
-	
+	if ($to_date == null)
+		$to_date = Today();
+
+	$to_date = date2sql($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 standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
+
 	if ($location != 'all')
-		$sql .= " AND loc_code = ".db_escape($location);
-   
-    $sql .= " ORDER BY tran_date";
-    $result = db_query($sql, "No standard cost transactions were returned");
+		$sql .= " AND move.loc_code = ".db_escape($location);
+
+	$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);
+    	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;
+	}
+	if ($qty == 0)
+		return 0;
+	return $tot_cost / $qty;
 }
 
 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, ";
-    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";
-    if ($category != 0)
-        $sql .= " AND ".TB_PREF."stock_master.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";
-    
+	$date = date2sql($date);
+
+	$sql = "SELECT item.category_id,
+			category.description AS cat_description,
+			item.stock_id,
+			item.units,
+			item.description, item.inactive,
+			move.loc_code,
+			units.decimals,
+			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,"
+			.TB_PREF."item_units units
+		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'
+		AND item.units=units.abbr
+		GROUP BY item.category_id,
+			category.description, ";
+		if ($location != 'all')
+			$sql .= "move.loc_code, ";
+		$sql .= "item.stock_id,
+			item.description
+		HAVING ROUND(SUM(move.qty), units.decimals) != 0";
+		if ($category != 0)
+			$sql .= " AND item.category_id = ".db_escape($category);
+		if ($location != 'all')
+			$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");
 }
+
 //----------------------------------------------------------------------------------------------------
+
 function print_inventory_valuation_report()
 {
-    global $path_to_root, $use_costed_values;;
-    $date = $_POST['PARAM_0'];
+    global $path_to_root, $SysPrefs;
+
+	$date = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
     $location = $_POST['PARAM_2'];
     $detail = $_POST['PARAM_3'];
     $comments = $_POST['PARAM_4'];
-    $orientation = $_POST['PARAM_5'];
-    $destination = $_POST['PARAM_6'];
-    if ($destination)
-        include_once($path_to_root . "/reporting/includes/excel_report.inc");
-    else
-        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-    $detail = !$detail;
+	$orientation = $_POST['PARAM_5'];
+	$destination = $_POST['PARAM_6'];
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+	$detail = !$detail;
     $dec = user_price_dec();
-    $orientation = ($orientation ? 'L' : 'P');
-    if ($category == ALL_NUMERIC)
-        $category = 0;
-    if ($category == 0)
-        $cat = _('All');
-    else
-        $cat = get_category_name($category);
-    if ($location == ALL_TEXT)
-        $location = 'all';
-    if ($location == 'all')
-        $loc = _('All');
-    else
-        $loc = get_location_name($location);
-    $cols = array(0, 75, 225, 250, 350, 450,    515);
-    $headers = array(_('Category'), '', _('UOM'), _('Quantity'), _('Unit Cost'), _('Value'));
-    $aligns = array('left',    'left',    'left', 'right', 'right', 'right');
-    $params =   array(     0 => $comments,
-                        1 => array('text' => _('End Date'), 'from' => $date,         'to' => ''),
-                        2 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
-                        3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
+
+	$orientation = ($orientation ? 'L' : 'P');
+	if ($category == ALL_NUMERIC)
+		$category = 0;
+	if ($category == 0)
+		$cat = _('All');
+	else
+		$cat = get_category_name($category);
+
+	if ($location == ALL_TEXT)
+		$location = 'all';
+	if ($location == 'all')
+		$loc = _('All');
+	else
+		$loc = get_location_name($location);
+
+	$cols = array(0, 75, 225, 250, 350, 450,	515);
+
+	$headers = array(_('Category'), '', _('UOM'), _('Quantity'), _('Unit Cost'), _('Value'));
+
+	$aligns = array('left',	'left',	'left', 'right', 'right', 'right');
+
+    $params =   array( 	0 => $comments,
+    					1 => array('text' => _('End Date'), 'from' => $date, 		'to' => ''),
+    				    2 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
+    				    3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
+
     $rep = new FrontReport(_('Inventory Valuation Report'), "InventoryValReport", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
-        recalculate_cols($cols);
+    	recalculate_cols($cols);
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();
-    $res = getTransactions($category, $location, $date);
-    $total = $grandtotal = 0.0;
-    $catt = '';
-    while ($trans=db_fetch($res))
-    {
-        if ($catt != $trans['cat_description'])
-        {
-            if ($catt != '')
-            {
-                if ($detail)
-                {
-                    $rep->NewLine(2, 3);
-                    $rep->TextCol(0, 4, _('Total'));
-                }
-                $rep->AmountCol(5, 6, $total, $dec);
-                if ($detail)
-                {
-                    $rep->Line($rep->row - 2);
-                    $rep->NewLine();
-                }
-                $rep->NewLine();
-                $total = 0.0;
-            }
-            $rep->TextCol(0, 1, $trans['category_id']);
-            $rep->TextCol(1, 2, $trans['cat_description']);
-            $catt = $trans['cat_description'];
-            if ($detail)
-                $rep->NewLine();
-        }
-        if (isset($use_costed_values) && $use_costed_values==1)
-        {
-            $UnitCost = getAverageCost($trans['stock_id'], $location, $date);
-            $ItemTotal = $trans['QtyOnHand'] * $UnitCost;
-        }
-        else
-        {
-            $UnitCost = $trans['UnitCost'];
-            $ItemTotal = $trans['ItemTotal'];
-        }
-        if ($detail)
-        {
-            $rep->NewLine();
-            $rep->fontSize -= 2;
-            $rep->TextCol(0, 1, $trans['stock_id']);
-            $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($UnitCost, $dec2);
-            $rep->AmountCol(4, 5, $UnitCost, $dec2);
-            $rep->AmountCol(5, 6, $ItemTotal, $dec);
-            $rep->fontSize += 2;
-        }
-        $total += $ItemTotal;
-        $grandtotal += $ItemTotal;
-    }
-    if ($detail)
-    {
-        $rep->NewLine(2, 3);
-        $rep->TextCol(0, 4, _('Total'));
-    }
-    $rep->Amountcol(5, 6, $total, $dec);
-    if ($detail)
-    {
-        $rep->Line($rep->row - 2);
-        $rep->NewLine();
-    }
-    $rep->NewLine(2, 1);
-    $rep->TextCol(0, 4, _('Grand Total'));
-    $rep->AmountCol(5, 6, $grandtotal, $dec);
-    $rep->Line($rep->row  - 4);
-    $rep->NewLine();
+
+	$res = getTransactions($category, $location, $date);
+	$total = $grandtotal = 0.0;
+	$catt = '';
+	while ($trans=db_fetch($res))
+	{
+		if ($catt != $trans['cat_description'])
+		{
+			if ($catt != '')
+			{
+				if ($detail)
+				{
+					$rep->NewLine(2, 3);
+					$rep->TextCol(0, 4, _('Total'));
+				}
+				$rep->AmountCol(5, 6, $total, $dec);
+				if ($detail)
+				{
+					$rep->Line($rep->row - 2);
+					$rep->NewLine();
+				}
+				$rep->NewLine();
+				$total = 0.0;
+			}
+			$rep->TextCol(0, 1, $trans['category_id']);
+			$rep->TextCol(1, 2, $trans['cat_description']);
+			$catt = $trans['cat_description'];
+			if ($detail)
+				$rep->NewLine();
+		}
+		if (isset($SysPrefs->use_costed_values) && $SysPrefs->use_costed_values==1)
+		{
+			$UnitCost = getAverageCost($trans['stock_id'], $location, $date);
+			$ItemTotal = $trans['QtyOnHand'] * $UnitCost;
+		}	
+		else
+		{
+			$UnitCost = $trans['UnitCost'];
+			$ItemTotal = $trans['ItemTotal'];
+		}	
+		if ($detail)
+		{
+			$rep->NewLine();
+			$rep->fontSize -= 2;
+			$rep->TextCol(0, 1, $trans['stock_id']);
+			$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($UnitCost, $dec2);
+			$rep->AmountCol(4, 5, $UnitCost, $dec2);
+			$rep->AmountCol(5, 6, $ItemTotal, $dec);
+			$rep->fontSize += 2;
+		}
+		$total += $ItemTotal;
+		$grandtotal += $ItemTotal;
+	}
+	if ($detail)
+	{
+		$rep->NewLine(2, 3);
+		$rep->TextCol(0, 4, _('Total'));
+	}
+	$rep->Amountcol(5, 6, $total, $dec);
+	if ($detail)
+	{
+		$rep->Line($rep->row - 2);
+		$rep->NewLine();
+	}
+	$rep->NewLine(2, 1);
+	$rep->TextCol(0, 4, _('Grand Total'));
+	$rep->AmountCol(5, 6, $grandtotal, $dec);
+	$rep->Line($rep->row  - 4);
+	$rep->NewLine();
     $rep->End();
 }
-?>
\ No newline at end of file
+