X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=125cf5f87dd95255771b6898419a348d52b48d42;hb=89d9b659abe59b9ee1357b3f08857f8f0e43e425;hp=5a3094409fb861afb6e91a0e64070f2db6855993;hpb=d4bcee971cf7ea37e2afc9d6abeb16d00af20de8;p=fa-stable.git
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 5a309440..125cf5f8 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);
@@ -276,9 +276,13 @@ class BoxReports
case 'GL_ACCOUNTS':
return gl_all_accounts_list($name);
+ case 'BANK_ACCOUNTS_NO_FILTER':
case 'BANK_ACCOUNTS':
- return bank_accounts_list($name);
-
+ if ($type == 'BANK_ACCOUNTS_NO_FILTER')
+ return bank_accounts_list($name, null, false, _("All"));
+ else
+ return bank_accounts_list($name);
+
case 'DIMENSION':
return dimensions_list($name, null, false, ' ', false, true, 0);
@@ -299,7 +303,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 +310,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
@@ -319,8 +321,9 @@ class BoxReports
$sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
concat('$IV ', debtor_trans.$ref,' ', debtor.name) as IName
FROM ".TB_PREF."debtors_master debtor,"
- .TB_PREF."debtor_trans debtor_trans
- WHERE type=".ST_SALESINVOICE." AND debtor.debtor_no=debtor_trans.debtor_no
+ .TB_PREF."debtor_trans debtor_trans LEFT JOIN ".TB_PREF."voided AS vd ON debtor_trans.type=vd.type AND
+ debtor_trans.trans_no=vd.id
+ WHERE debtor_trans.type=".ST_SALESINVOICE." AND debtor.debtor_no=debtor_trans.debtor_no AND ISNULL(vd.id)
ORDER BY debtor_trans.trans_no DESC";
return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
@@ -330,18 +333,20 @@ class BoxReports
$sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
concat('$CN ', debtor_trans.$ref,' ', debtor.name) as IName
FROM ".TB_PREF."debtors_master debtor,"
- .TB_PREF."debtor_trans debtor_trans
- WHERE type=".ST_CUSTCREDIT." AND debtor.debtor_no=debtor_trans.debtor_no
+ .TB_PREF."debtor_trans debtor_trans LEFT JOIN ".TB_PREF."voided AS vd ON debtor_trans.type=vd.type AND
+ debtor_trans.trans_no=vd.id
+ WHERE debtor_trans.type=".ST_CUSTCREDIT." AND debtor.debtor_no=debtor_trans.debtor_no AND ISNULL(vd.id)
ORDER BY debtor_trans.trans_no DESC";
return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
case 'DELIVERY':
$DN = $type_shortcuts[ST_CUSTDELIVERY];
- $sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
+ $sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
concat(debtor_trans.trans_no, ' $DN ', debtor.name) as IName
FROM ".TB_PREF."debtors_master debtor,"
- .TB_PREF."debtor_trans debtor_trans
- WHERE type=".ST_CUSTDELIVERY." AND debtor.debtor_no=debtor_trans.debtor_no
+ .TB_PREF."debtor_trans debtor_trans LEFT JOIN ".TB_PREF."voided AS vd ON debtor_trans.type=vd.type AND
+ debtor_trans.trans_no=vd.id
+ WHERE debtor_trans.type=".ST_CUSTDELIVERY." AND debtor.debtor_no=debtor_trans.debtor_no AND ISNULL(vd.id)
ORDER BY debtor_trans.trans_no DESC";
return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
@@ -360,7 +365,7 @@ class BoxReports
FROM ".TB_PREF."debtors_master debtor,"
.TB_PREF."sales_orders sorder
WHERE debtor.debtor_no=sorder.debtor_no AND sorder.trans_type=".ST_SALESQUOTE
- ." ORDER BY sorder.order_no DESC";
+ ." ORDER BY sorder.order_no DESC";
return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false));
case 'PO':
@@ -378,12 +383,14 @@ class BoxReports
$CN = $type_shortcuts[ST_SUPPCREDIT];
$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
$sql = "SELECT concat(trans.trans_no, '-',trans.type) AS TNO,
- concat(trans.$ref, IF(type=".ST_BANKPAYMENT.", ' $BP ', IF(type=".ST_SUPPAYMENT.", ' $SP ', ' $CN ')), supplier.supp_name) as IName
- FROM ".TB_PREF."suppliers supplier, "
- .TB_PREF."supp_trans trans
- WHERE type IN(".ST_BANKPAYMENT.",".ST_SUPPAYMENT.",".ST_SUPPCREDIT.")
- AND supplier.supplier_id=trans.supplier_id
- ORDER BY trans.trans_no DESC";
+ concat(trans.$ref, IF(trans.type=".ST_BANKPAYMENT.", ' $BP ', IF(trans.type=".ST_SUPPAYMENT.", ' $SP ',
+ ' $CN ')),
+ supplier.supp_name) as IName
+ FROM ".TB_PREF."suppliers supplier, "
+ .TB_PREF."supp_trans trans LEFT JOIN ".TB_PREF."voided AS vd ON trans.type=vd.type AND trans.trans_no=vd.id
+ WHERE trans.type IN(".ST_BANKPAYMENT.",".ST_SUPPAYMENT.",".ST_SUPPCREDIT.") AND
+ supplier.supplier_id=trans.supplier_id AND ISNULL(vd.id)
+ ORDER BY trans.trans_no DESC";
return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
case 'RECEIPT':
@@ -391,10 +398,11 @@ class BoxReports
$CP = $type_shortcuts[ST_CUSTPAYMENT];
$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
$sql = "SELECT concat(trans.trans_no, '-', trans.type) AS TNO,
- concat(trans.$ref, IF(type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), debtor.name) as IName
+ concat(trans.$ref, IF(trans.type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), debtor.name) as IName
FROM ".TB_PREF."debtors_master debtor,"
- .TB_PREF."debtor_trans trans
- WHERE type IN(".ST_BANKDEPOSIT.",".ST_CUSTPAYMENT.",".ST_CUSTCREDIT.") AND debtor.debtor_no=trans.debtor_no
+ .TB_PREF."debtor_trans trans LEFT JOIN ".TB_PREF."voided AS vd ON trans.type=vd.type AND trans.trans_no=vd.id
+ WHERE trans.type IN(".ST_BANKDEPOSIT.",".ST_CUSTPAYMENT.",".ST_CUSTCREDIT.") AND
+ debtor.debtor_no=trans.debtor_no AND ISNULL(vd.id)
ORDER BY trans.trans_no DESC";
return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
@@ -410,8 +418,10 @@ 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
- 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));
@@ -430,7 +440,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 +472,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;