X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep409.php;h=6f453834fc45895cacf46abc3c7ebdc58d778676;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=a4d41c7008f741b7f2ca8ffaee50ded4e054db07;hpb=74d962f7a82f2fd9543bf35faaa5026403b98cee;p=fa-stable.git

diff --git a/reporting/rep409.php b/reporting/rep409.php
index a4d41c70..6f453834 100644
--- a/reporting/rep409.php
+++ b/reporting/rep409.php
@@ -28,7 +28,7 @@ print_workorders();
 
 function print_workorders()
 {
-	global $path_to_root, $SysPrefs, $dflt_lang;
+	global $path_to_root, $dflt_lang;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -36,9 +36,11 @@ function print_workorders()
 	$to = $_POST['PARAM_1'];
 	$email = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+	$orientation = $_POST['PARAM_4'];
 
 	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
 	$from = min($fno[0], $tno[0]);
@@ -54,67 +56,38 @@ function print_workorders()
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
-	{
-		$rep = new FrontReport(_('WORK ORDER'), "WorkOrderBulk", user_pagesize());
-		$rep->SetHeaderType('Header2');
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
+		$rep = new FrontReport(_('WORK ORDER'), "WorkOrderBulk", user_pagesize(), 9, $orientation);
+   	if ($orientation == 'L')
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
-		$myrow = get_work_order($i);
+		$myrow = get_work_order($i, true);
 		if ($myrow === false)
 			continue;
-		$date_ = sql2date($myrow["date_"]);
 		if ($email == 1)
 		{
-			$rep = new FrontReport("", "", user_pagesize());
-			$rep->SetHeaderType('Header2');
-			$rep->currency = $cur;
-			$rep->Font();
-				$rep->title = _('WORK ORDER');
-				$rep->filename = "WorkOrder" . $myrow['wo_ref'] . ".pdf";
-			$rep->Info($params, $cols, null, $aligns);
-		}
-		else
+			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
 			$rep->title = _('WORK ORDER');
+			$rep->filename = "WorkOrder" . $myrow['wo_ref'] . ".pdf";
+		}
+		$rep->currency = $cur;
+		$rep->Font();
+		$rep->Info($params, $cols, null, $aligns);
 
-		$contact[] = array('email' =>$myrow['email'],'lang' => $dflt_lang,
+		$contact = array('email' =>$myrow['email'],'lang' => $dflt_lang, // ???
 			'name' => $myrow['contact'], 'name2' => '', 'contact');
 
 		$rep->SetCommonData($myrow, null, null, '', 26, $contact);
+		$rep->SetHeaderType('Header2');
 		$rep->NewPage();
 
 		$result = get_wo_requirements($i);
 		$rep->TextCol(0, 5,_("Work Order Requirements"), -2);
 		$rep->NewLine(2);
-		$has_marked = false;
 		while ($myrow2=db_fetch($result))
 		{
-			$qoh = 0;
-			$show_qoh = true;
-			// if it's a non-stock item (eg. service) don't show qoh
-			if (!has_stock_holding($myrow2["mb_flag"]))
-				$show_qoh = false;
-
-			if ($show_qoh)
-				$qoh = get_qoh_on_date($myrow2["stock_id"], $myrow2["loc_code"], $date_);
-
-			if ($show_qoh && ($myrow2["units_req"] * $myrow["units_issued"] > $qoh) &&
-				!$SysPrefs->allow_negative_stock())
-			{
-				// oops, we don't have enough of one of the component items
-				$has_marked = true;
-			}
-			else
-				$has_marked = false;
-			if ($has_marked)
-				$str = $myrow2['stock_id']." ***";
-			else
-				$str = $myrow2['stock_id'];
-			$rep->TextCol(0, 1,	$str, -2);
+			$rep->TextCol(0, 1,	$myrow2['stock_id'], -2);
 			$rep->TextCol(1, 2, $myrow2['description'], -2);
 
 			$rep->TextCol(2, 3,	$myrow2['location_name'], -2);
@@ -128,16 +101,13 @@ function print_workorders()
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->NewPage();
 		}
-		$rep->NewLine(1);
-		$rep->TextCol(0, 5," *** = "._("Insufficient stock"), -2);
-
-		$comments = get_comments(ST_WORKORDER, $i);
-		if ($comments && db_num_rows($comments))
+		$memo = get_comments_string(ST_WORKORDER, $i);
+		if ($memo != "")
 		{
 			$rep->NewLine();
-			while ($comment=db_fetch($comments))
-				$rep->TextColLines(0, 6, $comment['memo_'], -2);
+			$rep->TextColLines(1, 5, $memo, -2);
 		}
+
 		if ($email == 1)
 		{
 			$myrow['DebtorName'] = $myrow['contact'];
@@ -149,4 +119,3 @@ function print_workorders()
 		$rep->End();
 }
 
-?>
\ No newline at end of file