Fixed email multiplication when bulk work order report is generated.

[fa-stable.git] / reporting / rep409.php

diff --git a/reporting/rep409.php b/reporting/rep409.php
index 60f58b049be4341e66ab62dfea0c80068254afe7..a57974260ce9c0f28b7f8d5fd0609b940a1f667a 100644 (file)
--- a/reporting/rep409.php
+++ b/reporting/rep409.php
@@ -37,14 +37,12 @@ function print_workorders()
        $email = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
 
-       if ($from == null)
-               $from = 0;
-       if ($to == null)
-               $to = 0;
-       $dec = user_price_dec();
+       if (!$from || !$to) return;
 
        $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);
 
@@ -64,7 +62,7 @@ function print_workorders()
                $rep->Info($params, $cols, null, $aligns);
        }
 
-       for ($i = $fno[0]; $i <= $tno[0]; $i++)
+       for ($i = $from; $i <= $to; $i++)
        {
                $myrow = get_work_order($i);
                if ($myrow === false)
@@ -83,7 +81,7 @@ function print_workorders()
                else
                        $rep->title = _('WORK ORDER');
 
-               $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 +131,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)