X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=56148d70e8607a537daa3ca1a3f4285ad9d4f0fd;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=96134f95e21c05f6949f574566c5fed8938dd1f2;hpb=aae35509fd8348f9e2c26ea923c8b2f3934dc793;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 96134f95..56148d70 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -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));