[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

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

diff --git a/reporting/rep409.php b/reporting/rep409.php
index 218f07faa59191b84f20cdda2c54c61325e2bb59..6f453834fc45895cacf46abc3c7ebdc58d778676 100644 (file)
--- 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");
 
@@ -62,10 +62,9 @@ function print_workorders()
 
        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(), 9, $orientation);
@@ -86,31 +85,9 @@ function print_workorders()
                $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);
@@ -124,9 +101,6 @@ function print_workorders()
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
                                $rep->NewPage();
                }
-               $rep->NewLine(1);
-               $rep->TextCol(0, 5," *** = "._("Insufficient stock"), -2);
-
                $memo = get_comments_string(ST_WORKORDER, $i);
                if ($memo != "")
                {