4869: Work order listing and print work orders reports should omit voided orders...

[fa-stable.git] / reporting / includes / reports_classes.inc

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 77399c3f3a663b3c08631bc5909f57a101c7e5fa..1ad826e4a1187b71a0fb80be6eb5eb5478cd58e7 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -410,6 +410,8 @@ class BoxReports
                                                FROM ".TB_PREF."stock_master item,"
                                                        .TB_PREF."workorders wo 
                                                        LEFT JOIN ".TB_PREF."voided v ON wo.id=v.id and v.type=".ST_WORKORDER."
+                                               WHERE ISNULL(v.id)
+                                               AND item.stock_id=wo.stock_id
                                                WHERE item.stock_id=wo.stock_id
                                                ORDER BY wo.id DESC";
                                        return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));