X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep401.php;h=ddb9692fba1defb90c51b204d8a5b5cd1a6a85fb;hb=d8d40a67b517dd35425a1fa0eb02f84c3f9fd843;hp=e72f163ce02037886435cd3e2cfd9f77c0e893c6;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/reporting/rep401.php b/reporting/rep401.php
index e72f163c..ddb9692f 100644
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -30,21 +30,21 @@ print_bill_of_material();
 
 function getTransactions($from, $to)
 {
-	$sql = "SELECT ".TB_PREF."bom.parent,
-			".TB_PREF."bom.component,
-			".TB_PREF."stock_master.description as CompDescription,
-			".TB_PREF."bom.quantity,
-			".TB_PREF."bom.loc_code,
-			".TB_PREF."bom.workcentre_added
-		FROM
-			".TB_PREF."stock_master,
-			".TB_PREF."bom
-		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component
-		AND ".TB_PREF."bom.parent >= ".db_escape($from)."
-		AND ".TB_PREF."bom.parent <= ".db_escape($to)."
+	$sql = "SELECT bom.parent,
+			bom.component,
+			item.description as CompDescription,
+			bom.quantity,
+			bom.loc_code,
+			bom.workcentre_added
+		FROM "
+			.TB_PREF."stock_master item,"
+			.TB_PREF."bom bom
+		WHERE item.stock_id=bom.component
+		AND bom.parent >= ".db_escape($from)."
+		AND bom.parent <= ".db_escape($to)."
 		ORDER BY
-			".TB_PREF."bom.parent,
-			".TB_PREF."bom.component";
+			bom.parent,
+			bom.component";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -58,12 +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");
 	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'));
@@ -73,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", 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 = '';
@@ -101,8 +105,6 @@ function print_bill_of_material()
 		$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']);
 		$wc = get_work_centre($trans['workcentre_added']);
 		$rep->TextCol(2, 3, get_location_name($trans['loc_code']));
 		$rep->TextCol(3, 4, $wc['name']);
@@ -113,4 +115,3 @@ function print_bill_of_material()
     $rep->End();
 }
 
-?>
\ No newline at end of file