X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=fc600e965739f212f06a5e1522d8cedccdf3a3aa;hb=8429c2d2e1500cd879e084335391615e79fc3da3;hp=9c00255e0d4563c921731a812578c101a64d35db;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep302.php b/reporting/rep302.php
index 9c00255e..fc600e96 100644
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
@@ -26,7 +26,6 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_inventory_planning();
 
 function getTransactions($category, $location)
@@ -147,11 +146,14 @@ function print_inventory_planning()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $category = $_POST['PARAM_0'];
     $location = $_POST['PARAM_1'];
     $comments = $_POST['PARAM_2'];
+	$destination = $_POST['PARAM_3'];
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	if ($category == reserved_words::get_all_numeric())
 		$category = 0;
@@ -185,7 +187,7 @@ function print_inventory_planning()
     				    1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
     				    2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning.pdf", user_pagesize());
+    $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -219,26 +221,27 @@ function print_inventory_planning()
 		$dec = get_qty_dec($trans['stock_id']);
 		$rep->TextCol(0, 1, $trans['stock_id']);
 		$rep->TextCol(1, 2, $trans['description']);
-		$rep->TextCol(2, 3, number_format2($period['prd0'], $dec));
-		$rep->TextCol(3, 4, number_format2($period['prd1'], $dec));
-		$rep->TextCol(4, 5, number_format2($period['prd2'], $dec));
-		$rep->TextCol(5, 6, number_format2($period['prd3'], $dec));
-		$rep->TextCol(6, 7, number_format2($period['prd4'], $dec));
+		$rep->AmountCol(2, 3, $period['prd0'], $dec);
+		$rep->AmountCol(3, 4, $period['prd1'], $dec);
+		$rep->AmountCol(4, 5, $period['prd2'], $dec);
+		$rep->AmountCol(5, 6, $period['prd3'], $dec);
+		$rep->AmountCol(6, 7, $period['prd4'], $dec);
 
 		$MaxMthSales = Max($period['prd0'], $period['prd1'], $period['prd2'], $period['prd3']);
 		$IdealStockHolding = $MaxMthSales * 3;
-		$rep->TextCol(7, 8, number_format2($IdealStockHolding, $dec));
+		$rep->AmountCol(7, 8, $IdealStockHolding, $dec);
 
-		$rep->TextCol(8, 9, number_format2($trans['qty_on_hand'], $dec));
-		$rep->TextCol(9, 10, number_format2($custqty, $dec));
-		$rep->TextCol(10, 11, number_format2($suppqty, $dec));
+		$rep->AmountCol(8, 9, $trans['qty_on_hand'], $dec);
+		$rep->AmountCol(9, 10, $custqty, $dec);
+		$rep->AmountCol(10, 11, $suppqty, $dec);
 
 		$SuggestedTopUpOrder = $IdealStockHolding - $trans['qty_on_hand'] + $custqty - $suppqty;
 		if ($SuggestedTopUpOrder < 0.0)
 			$SuggestedTopUpOrder = 0.0;
-		$rep->TextCol(11, 12, number_format2($SuggestedTopUpOrder, $dec));
+		$rep->AmountCol(11, 12, $SuggestedTopUpOrder, $dec);
 	}
 	$rep->Line($rep->row - 4);
+	$rep->NewLine();
     $rep->End();
 }