X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=77399c3f3a663b3c08631bc5909f57a101c7e5fa;hb=52f4ea3f7360e1284b1cf1cd39b2efda6ff0606f;hp=5a3094409fb861afb6e91a0e64070f2db6855993;hpb=d4bcee971cf7ea37e2afc9d6abeb16d00af20de8;p=fa-stable.git
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 5a309440..77399c3f 100644
--- 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();
}
@@ -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;
@@ -265,7 +265,7 @@ class BoxReports
case 'TEXTBOX':
$value = (isset($_POST[$name]) ? $_POST[$name] : "");
- return "";
+ return "";
case 'ACCOUNTS': // not used
return gl_account_types_list($name, null, _("No Account Group Filter"), true);
@@ -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"));
@@ -462,7 +461,7 @@ class Report
var $ar_params;
var $controls;
- function Report($id, $name, $ar_params = null)
+ function __construct($id, $name, $ar_params = null)
{
$this->id = $id;
$this->name = $name;