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

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 1b9694d3890783ddd6acd5bb3a4625744b34627e..56148d70e8607a537daa3ca1a3f4285ad9d4f0fd 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -408,7 +408,8 @@ class BoxReports
                                case 'WORKORDER':
                                        $sql = "SELECT wo.id, concat(wo.id, '-', item.description) as IName
                                                FROM ".TB_PREF."stock_master item,"
-                                                       .TB_PREF."workorders wo
+                                                       .TB_PREF."workorders wo 
+                                                       LEFT JOIN ".TB_PREF."voided v ON wo.id=v.id and v.type=".ST_WORKORDER."
                                                WHERE item.stock_id=wo.stock_id
                                                ORDER BY wo.id DESC";
                                        return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));

diff --git a/reporting/rep409.php b/reporting/rep409.php
index 8ad6060636027ebb5d10eab677afa0e44596395d..6f453834fc45895cacf46abc3c7ebdc58d778676 100644 (file)
--- a/reporting/rep409.php
+++ b/reporting/rep409.php
@@ -62,7 +62,7 @@ function print_workorders()
 
        for ($i = $from; $i <= $to; $i++)
        {
-               $myrow = get_work_order($i);
+               $myrow = get_work_order($i, true);
                if ($myrow === false)
                        continue;
                if ($email == 1)