X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep409.php;h=7db6a4ef2b7255408371f20be0a49d56aeb28981;hb=13367be8aaf5175295f7aab7160370458dad1824;hp=60f58b049be4341e66ab62dfea0c80068254afe7;hpb=52cb07f22b3c471b08339236ae5bcb9c07ee779e;p=fa-stable.git

diff --git a/reporting/rep409.php b/reporting/rep409.php
index 60f58b04..7db6a4ef 100644
--- a/reporting/rep409.php
+++ b/reporting/rep409.php
@@ -36,15 +36,15 @@ function print_workorders()
 	$to = $_POST['PARAM_1'];
 	$email = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+	$orientation = $_POST['PARAM_4'];
 
-	if ($from == null)
-		$from = 0;
-	if ($to == null)
-		$to = 0;
-	$dec = user_price_dec();
+	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$fno = explode("-", $from);
 	$tno = explode("-", $to);
+	$from = min($fno[0], $tno[0]);
+	$to = max($fno[0], $tno[0]);
 
 	$cols = array(4, 60, 190, 255, 320, 385, 450, 515);
 
@@ -56,15 +56,11 @@ 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 = $fno[0]; $i <= $tno[0]; $i++)
+	for ($i = $from; $i <= $to; $i++)
 	{
 		$myrow = get_work_order($i);
 		if ($myrow === false)
@@ -72,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);
@@ -133,18 +127,18 @@ 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'];
 			$myrow['reference'] = $myrow['wo_ref'];
- 			$rep->End($email, _("Work Order No.") . " " . $myrow['wo_ref'], $myrow);
+ 			$rep->End($email);
 		}
 	}
 	if ($email == 0)