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

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

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 0a67200324dd35da81983a585cc5e3e3407b18fe..56148d70e8607a537daa3ca1a3f4285ad9d4f0fd 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -26,7 +26,7 @@ class BoxReports
        var $ar_reports;
        var $ctrl_handlers = array();
 
-       function ReportClasses()
+       function __construct()
        {
                $this->ar_classes = array();
        }
@@ -299,7 +299,6 @@ class BoxReports
 
                                case 'CUSTOMERS_NO_FILTER':
                                case 'CUSTOMERS':
-                                       $sql = "SELECT debtor_no, name FROM ".TB_PREF."debtors_master";
                                        if ($type == 'CUSTOMERS_NO_FILTER')
                                                return customer_list($name, null, _("No Customer Filter"));
                                        else
@@ -307,7 +306,6 @@ class BoxReports
 
                                case 'SUPPLIERS_NO_FILTER':
                                case 'SUPPLIERS':
-                                       $sql = "SELECT supplier_id, supp_name FROM ".TB_PREF."suppliers";
                                        if ($type == 'SUPPLIERS_NO_FILTER')
                                                return supplier_list($name, null, _("No Supplier Filter"));
                                        else
@@ -410,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));
@@ -430,7 +429,7 @@ class BoxReports
                                        return sales_types_list($name);
 
                                case 'AREAS':
-                                       return sales_areas_list($name);
+                                       return sales_areas_list($name, null, _("No Areas Filter"));
 
                                case 'SALESMEN':
                                        return sales_persons_list($name, null, _("No Sales Folk Filter"));