X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=77399c3f3a663b3c08631bc5909f57a101c7e5fa;hb=ad0504645e3632d169d0f253bb5eb4db8b7e18b9;hp=1b9694d3890783ddd6acd5bb3a4625744b34627e;hpb=9f832e8ab3c679ab67e5d086a99774dac58e004a;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 1b9694d3..77399c3f 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -34,7 +34,7 @@ class BoxReports
 	function addReportClass($class_name, $class_id=null)
 	{
 		if (!$class_id)
-			$class_id = count($this->ar_classes);
+			$class_id = count_array($this->ar_classes);
 		$this->ar_classes[$class_id] = $class_name;
 
 		return $class_id;
@@ -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));