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

diff --git a/reporting/rep401.php b/reporting/rep401.php
index c0d3987d..eac5001e 100644
--- a/reporting/rep401.php
+++ b/reporting/rep401.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_BOMREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
 // Title:	Bill Of Material
 // ----------------------------------------------------------------
-$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_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_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_bill_of_material();
 
 function getTransactions($from, $to)
@@ -32,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";
@@ -47,14 +55,17 @@ 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'];
-    
-    $dec = user_qty_dec();
-
+	$orientation = $_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");
+
+	$orientation = ($orientation ? 'L' : 'P');
 	$cols = array(0, 50, 305, 375, 445,	515);
 
 	$headers = array(_('Component'), _('Description'), _('Loc'), _('Wrk Ctr'), _('Quantity'));
@@ -64,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'), "BillOfMaterial.pdf", 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 = '';
@@ -87,16 +100,20 @@ function print_bill_of_material()
 			$parent = $trans['parent'];
 			$rep->NewLine();
 		}
-		
+
 		$rep->NewLine();
+		$dec = get_qty_dec($trans['component']);
 		$rep->TextCol(0, 1, $trans['component']);
 		$rep->TextCol(1, 2, $trans['CompDescription']);
-		$rep->TextCol(2, 3, $trans['loc_code']);
-		$rep->TextCol(3, 4, $trans['workcentre_added']);
-		$rep->TextCol(4, 5, number_format2($trans['quantity'], $dec));
+		//$rep->TextCol(2, 3, $trans['loc_code']);
+		//$rep->TextCol(3, 4, $trans['workcentre_added']);
+		$wc = get_work_centre($trans['workcentre_added']);
+		$rep->TextCol(2, 3, get_location_name($trans['loc_code']));
+		$rep->TextCol(3, 4, $wc['name']);
+		$rep->AmountCol(4, 5, $trans['quantity'], $dec);
 	}
 	$rep->Line($rep->row - 4);
+	$rep->NewLine();
     $rep->End();
 }
 
-?>
\ No newline at end of file