projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun - Show more relevant info in CounterPart Field, Journal Inquiry.
[fa-stable.git]
/
reporting
/
includes
/
reports_classes.inc
diff --git
a/reporting/includes/reports_classes.inc
b/reporting/includes/reports_classes.inc
index 01e76da7583cd568bce7ec5b7817147baf348af8..0d150930760c79f8c096e1599f1561f73c161a5a 100644
(file)
--- a/
reporting/includes/reports_classes.inc
+++ b/
reporting/includes/reports_classes.inc
@@
-18,6
+18,7
@@
define('RC_MANUFACTURE', 3);
define('RC_DIMENSIONS', 4);
define('RC_BANKING', 5);
define('RC_GL', 6);
define('RC_DIMENSIONS', 4);
define('RC_BANKING', 5);
define('RC_GL', 6);
+define('RC_FIXEDASSETS', 7);
class BoxReports
{
class BoxReports
{
@@
-25,7
+26,7
@@
class BoxReports
var $ar_reports;
var $ctrl_handlers = array();
var $ar_reports;
var $ctrl_handlers = array();
- function
ReportClasses
()
+ function
__construct
()
{
$this->ar_classes = array();
}
{
$this->ar_classes = array();
}
@@
-33,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 = count($this->ar_classes);
+ $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;
@@
-264,7
+265,7
@@
class BoxReports
case 'TEXTBOX':
$value = (isset($_POST[$name]) ? $_POST[$name] : "");
case 'TEXTBOX':
$value = (isset($_POST[$name]) ? $_POST[$name] : "");
- return "<textarea rows=4 cols=30 name='$name'>$value</textarea>";
+ return "<textarea rows=4 cols=30
maxlength=130
name='$name'>$value</textarea>";
case 'ACCOUNTS': // not used
return gl_account_types_list($name, null, _("No Account Group Filter"), true);
case 'ACCOUNTS': // not used
return gl_account_types_list($name, null, _("No Account Group Filter"), true);
@@
-298,7
+299,6
@@
class BoxReports
case 'CUSTOMERS_NO_FILTER':
case 'CUSTOMERS':
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
if ($type == 'CUSTOMERS_NO_FILTER')
return customer_list($name, null, _("No Customer Filter"));
else
@@
-306,7
+306,6
@@
class BoxReports
case 'SUPPLIERS_NO_FILTER':
case 'SUPPLIERS':
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
if ($type == 'SUPPLIERS_NO_FILTER')
return supplier_list($name, null, _("No Supplier Filter"));
else
@@
-409,22
+408,29
@@
class BoxReports
case 'WORKORDER':
$sql = "SELECT wo.id, concat(wo.id, '-', item.description) as IName
FROM ".TB_PREF."stock_master item,"
case 'WORKORDER':
$sql = "SELECT wo.id, concat(wo.id, '-', item.description) as IName
FROM ".TB_PREF."stock_master item,"
- .TB_PREF."workorders wo
- WHERE item.stock_id=wo.stock_id
+ .TB_PREF."workorders wo
+ LEFT JOIN ".TB_PREF."voided v ON wo.id=v.id and v.type=".ST_WORKORDER."
+ 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));
case 'LOCATIONS':
return locations_list($name, null, _("No Location Filter"));
ORDER BY wo.id DESC";
return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));
case 'LOCATIONS':
return locations_list($name, null, _("No Location Filter"));
+ case 'FLOCATIONS':
+ return locations_list($name, null, _("No Location Filter"), false, true);
case 'CATEGORIES':
return stock_categories_list($name, null, _("No Category Filter"));
case 'CATEGORIES':
return stock_categories_list($name, null, _("No Category Filter"));
-
+ case 'FCATEGORIES':
+ return stock_categories_list($name, null, _("No Category Filter"), false, true);
+ case 'FCLASS':
+ return fixed_asset_classes_list($name, null, _("No Class Filter"), false);
case 'SALESTYPES':
return sales_types_list($name);
case 'AREAS':
case 'SALESTYPES':
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"));
case 'SALESMEN':
return sales_persons_list($name, null, _("No Sales Folk Filter"));
@@
-456,7
+462,7
@@
class Report
var $ar_params;
var $controls;
var $ar_params;
var $controls;
- function
Repor
t($id, $name, $ar_params = null)
+ function
__construc
t($id, $name, $ar_params = null)
{
$this->id = $id;
$this->name = $name;
{
$this->id = $id;
$this->name = $name;