X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;h=2b18d24b2cc477ee0d8068fe610cd932c28e5d88;hb=80f65fcccf34fc034e369f44de103599de96fd87;hp=bf189355be17e9491850aa56e982c2ed23b09d8f;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index bf189355..2b18d24b 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -26,7 +26,6 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_inventory_valuation_report();
 
 function getTransactions($category, $location)
@@ -68,12 +67,15 @@ 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");
 
     $dec = user_price_dec();
 
@@ -101,7 +103,7 @@ 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);
@@ -121,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);
@@ -142,9 +144,9 @@ function print_inventory_valuation_report()
 			$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->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'];
@@ -155,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);
@@ -163,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();
 }