projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun /reporting/includes/report_classes.inc
[fa-stable.git]
/
reporting
/
includes
/
reports_classes.inc
diff --git
a/reporting/includes/reports_classes.inc
b/reporting/includes/reports_classes.inc
index 419f69ef102fd4ba945be1665e0bce61ae7339e7..0d150930760c79f8c096e1599f1561f73c161a5a 100644
(file)
--- 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)
function addReportClass($class_name, $class_id=null)
{
if (!$class_id)
- $class_id =
is_array($this->ar_classes) ? count($this->ar_classes) : 0
;
+ $class_id =
count_array($this->ar_classes)
;
$this->ar_classes[$class_id] = $class_name;
return $class_id;
$this->ar_classes[$class_id] = $class_name;
return $class_id;
@@
-410,7
+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."
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 item.stock_id=wo.stock_id
+ WHERE ISNULL(v.id)
+ AND item.stock_id=wo.stock_id
ORDER BY wo.id DESC";
return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));
ORDER BY wo.id DESC";
return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));