X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;h=4bd74be3e42bbfbdd1fe9135a35f47628024e88f;hb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;hp=a2801336bd5f30f7f4bcdff9fb612470d5e45563;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index a2801336..4bd74be3 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -1,23 +1,31 @@
 <?php
-
-$page_security = 2;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_ITEMSVALREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
-// Title:	Supplier Balances
+// Title:	Inventory Valuation
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-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");
+include_once($path_to_root . "/includes/session.inc");
+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");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_inventory_valuation_report();
 
 function getTransactions($category, $location)
@@ -44,9 +52,9 @@ function getTransactions($category, $location)
 			".TB_PREF."stock_master.description
 		HAVING SUM(".TB_PREF."stock_moves.qty) != 0";
 		if ($category != 0)
-			$sql .= " AND ".TB_PREF."stock_master.category_id = '$category'";
+			$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
 		if ($location != 'all')
-			$sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'";
+			$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";
 
@@ -59,23 +67,26 @@ function print_inventory_valuation_report()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "reporting/includes/pdf_report.inc");
-
     $category = $_POST['PARAM_0'];
     $location = $_POST['PARAM_1'];
     $detail = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-
+	$destination = $_POST['PARAM_4'];
+	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();
 
-	if ($category == reserved_words::get_all_numeric())
+	if ($category == ALL_NUMERIC)
 		$category = 0;
 	if ($category == 0)
 		$cat = _('All');
 	else
 		$cat = get_category_name($category);
 
-	if ($location == reserved_words::get_all())
+	if ($location == ALL_TEXT)
 		$location = 'all';
 	if ($location == 'all')
 		$loc = _('All');
@@ -92,11 +103,11 @@ function print_inventory_valuation_report()
     				    1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
     				    2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Valuation Report'), "InventoryValReport.pdf", user_pagesize());
+    $rep = new FrontReport(_('Inventory Valuation Report'), "InventoryValReport", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$res = getTransactions($category, $location);
 	$total = $grandtotal = 0.0;
@@ -112,7 +123,7 @@ function print_inventory_valuation_report()
 					$rep->NewLine(2, 3);
 					$rep->TextCol(0, 4, _('Total'));
 				}
-				$rep->Textcol(4, 5, number_format2($total, $dec));
+				$rep->AmountCol(4, 5, $total, $dec);
 				if ($detail)
 				{
 					$rep->Line($rep->row - 2);
@@ -130,13 +141,13 @@ function print_inventory_valuation_report()
 		if ($detail)
 		{
 			$rep->NewLine();
-			$rep->fontsize -= 2;
+			$rep->fontSize -= 2;
 			$rep->TextCol(0, 1, $trans['stock_id']);
 			$rep->TextCol(1, 2, $trans['description']);
-			$rep->TextCol(2, 3, number_format2($trans['QtyOnHand'], get_qty_dec($trans['stock_id'])));
-			$rep->TextCol(3, 4, number_format2($trans['UnitCost'], $dec));
-			$rep->TextCol(4, 5, number_format2($trans['ItemTotal'], $dec));
-			$rep->fontsize += 2;
+			$rep->AmountCol(2, 3, $trans['QtyOnHand'], get_qty_dec($trans['stock_id']));
+			$rep->AmountCol(3, 4, $trans['UnitCost'], $dec);
+			$rep->AmountCol(4, 5, $trans['ItemTotal'], $dec);
+			$rep->fontSize += 2;
 		}
 		$total += $trans['ItemTotal'];
 		$grandtotal += $trans['ItemTotal'];
@@ -146,7 +157,7 @@ function print_inventory_valuation_report()
 		$rep->NewLine(2, 3);
 		$rep->TextCol(0, 4, _('Total'));
 	}
-	$rep->Textcol(4, 5, number_format2($total, $dec));
+	$rep->Amountcol(4, 5, $total, $dec);
 	if ($detail)
 	{
 		$rep->Line($rep->row - 2);
@@ -154,8 +165,9 @@ function print_inventory_valuation_report()
 	}
 	$rep->NewLine(2, 1);
 	$rep->TextCol(0, 4, _('Grand Total'));
-	$rep->TextCol(4, 5, number_format2($grandtotal, $dec));
+	$rep->AmountCol(4, 5, $grandtotal, $dec);
 	$rep->Line($rep->row  - 4);
+	$rep->NewLine();
     $rep->End();
 }