X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep401.php;h=341c2247a6655562c764e09d178f917de72bb363;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=29c89f7226f013e83d15d1ab47f766525a939ca0;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git

diff --git a/reporting/rep401.php b/reporting/rep401.php
index 29c89f72..341c2247 100644
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -1,15 +1,15 @@
 <?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;
+$page_security = 'SA_BOMREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -26,7 +26,6 @@ include_once($path_to_root . "/inventory/includes/db/items_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_bill_of_material();
 
 function getTransactions($from, $to)
@@ -41,8 +40,8 @@ function getTransactions($from, $to)
 			".TB_PREF."stock_master,
 			".TB_PREF."bom
 		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component
-		AND ".TB_PREF."bom.parent >= '$from'
-		AND ".TB_PREF."bom.parent <= '$to'
+		AND ".TB_PREF."bom.parent >= ".db_escape($from)."
+		AND ".TB_PREF."bom.parent <= ".db_escape($to)."
 		ORDER BY
 			".TB_PREF."bom.parent,
 			".TB_PREF."bom.component";
@@ -56,11 +55,14 @@ function print_bill_of_material()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $frompart = $_POST['PARAM_0'];
     $topart = $_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");
 
 	$cols = array(0, 50, 305, 375, 445,	515);
 
@@ -71,11 +73,11 @@ function print_bill_of_material()
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
 
-    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial.pdf", user_pagesize());
+    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$res = getTransactions($frompart, $topart);
 	$parent = '';
@@ -104,9 +106,10 @@ function print_bill_of_material()
 		$wc = get_work_centre($trans['workcentre_added']);
 		$rep->TextCol(2, 3, get_location_name($trans['loc_code']));
 		$rep->TextCol(3, 4, $wc['name']);
-		$rep->TextCol(4, 5, number_format2($trans['quantity'], $dec));
+		$rep->AmountCol(4, 5, $trans['quantity'], $dec);
 	}
 	$rep->Line($rep->row - 4);
+	$rep->NewLine();
     $rep->End();
 }