X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=reporting%2Frep409.php;h=7db6a4ef2b7255408371f20be0a49d56aeb28981;hb=a53ada1fa7eac32d429456e08f5ac7fb753ebc0d;hp=a4d41c7008f741b7f2ca8ffaee50ded4e054db07;hpb=74d962f7a82f2fd9543bf35faaa5026403b98cee;p=fa-stable.git

diff --git a/reporting/rep409.php b/reporting/rep409.php
index a4d41c70..7db6a4ef 100644
--- a/reporting/rep409.php
+++ b/reporting/rep409.php
@@ -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,13 +56,9 @@ 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++)
 	{
@@ -70,18 +68,16 @@ function print_workorders()
 		$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->SetHeaderType('Header2');
+		$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);
@@ -131,13 +127,13 @@ function print_workorders()
 		$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'];