X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep401.php;h=eac5001e6037cf5ee2565a6b7d9d4b4cc8fd1e20;hb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;hp=3c8fed88b1ecb407a4c5df9e364262a546a49b27;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git

diff --git a/reporting/rep401.php b/reporting/rep401.php
index 3c8fed88..eac5001e 100644
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     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";
@@ -59,18 +58,14 @@ function print_bill_of_material()
     $frompart = $_POST['PARAM_0'];
     $topart = $_POST['PARAM_1'];
     $comments = $_POST['PARAM_2'];
-	$destination = $_POST['PARAM_3'];
+	$orientation = $_POST['PARAM_3'];
+	$destination = $_POST['PARAM_4'];
 	if ($destination)
-	{
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
-		$filename = "BillOfMaterial.xml";
-	}	
 	else
-	{
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-		$filename = "BillOfMaterial.pdf";
-	}
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$cols = array(0, 50, 305, 375, 445,	515);
 
 	$headers = array(_('Component'), _('Description'), _('Loc'), _('Wrk Ctr'), _('Quantity'));
@@ -80,11 +75,13 @@ function print_bill_of_material()
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
 
-    $rep = new FrontReport(_('Bill of Material Listing'), $filename, user_pagesize());
+    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$res = getTransactions($frompart, $topart);
 	$parent = '';
@@ -120,4 +117,3 @@ function print_bill_of_material()
     $rep->End();
 }
 
-?>
\ No newline at end of file