X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=reporting%2Fincludes%2Freports_classes.inc;h=97bfa0f6e2845a4b5aba147316831815a8d48968;hb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;hp=4069c873b9c8f30bf881bc75f70f70c420058b87;hpb=877aa741346d3ac9c0bfffa90cbe10ed16f7c8f3;p=fa-stable.git
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 4069c873..97bfa0f6 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -12,6 +12,7 @@
class BoxReports
{
var $ar_classes;
+ var $ctrl_handlers = array();
function ReportClasses()
{
@@ -31,7 +32,7 @@ class BoxReports
function getDisplay($class=null)
{
- global $table_style2, $comp_path, $path_to_root, $pdf_debug, $Ajax;
+ global $table_style, $comp_path, $path_to_root, $pdf_debug, $Ajax;
$temp = array_values($this->ar_classes);
@@ -63,10 +64,9 @@ class BoxReports
$st_params = "
\n";
set_focus('Rep'.$report->id);
@@ -99,7 +99,7 @@ class BoxReports
}
";
- $st .= "";
+ $st .= "";
$st .= "$st_classes | ";
$st .= "$st_reports | ";
$st .= "$st_params | ";
@@ -229,8 +229,6 @@ class BoxReports
return "";
case 'ACCOUNTS': // not used
-// $sql = "SELECT id, name FROM ".TB_PREF."chart_types";
-// return combo_input($name, '', $sql, 'id', 'name',array('spec_option'=>_("No Account Group Filter"),'spec_id'=>ALL_NUMERIC));
return gl_account_types_list($name, null, _("No Account Group Filter"), true);
case 'ACCOUNTS_NO_FILTER': // not used
@@ -324,6 +322,26 @@ class BoxReports
FROM ".TB_PREF."suppliers, ".TB_PREF."purch_orders WHERE ".TB_PREF."suppliers.supplier_id=".TB_PREF."purch_orders.supplier_id ORDER BY ".TB_PREF."purch_orders.order_no DESC";
return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false));
+ case 'REMITTANCE':
+ $BP = _("BP");
+ $SP = _("SP");
+ $CN = _("CN");
+ $ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
+ $sql = "SELECT concat(".TB_PREF."supp_trans.trans_no, '-',
+ ".TB_PREF."supp_trans.type) AS TNO, concat(".TB_PREF."supp_trans.$ref, if (type=".ST_BANKPAYMENT.", ' $BP ', if (type=".ST_SUPPAYMENT.", ' $SP ', ' $CN ')), ".TB_PREF."suppliers.supp_name) as IName
+ FROM ".TB_PREF."suppliers, ".TB_PREF."supp_trans WHERE (type=".ST_BANKPAYMENT." OR type=".ST_SUPPAYMENT." OR type=".ST_SUPPCREDIT.") AND ".TB_PREF."suppliers.supplier_id=".TB_PREF."supp_trans.supplier_id ORDER BY ".TB_PREF."supp_trans.trans_no DESC";
+ return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
+
+ case 'RECEIPT':
+ $BD = _("BD");
+ $CP = _("CP");
+ $CN = _("CN");
+ $ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
+ $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
+ ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', if (type=".ST_CUSTPAYMENT.", ' $CP ', ' $CN ')), ".TB_PREF."debtors_master.name) as IName
+ FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_BANKDEPOSIT." OR type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+ return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
+
case 'ITEMS':
return stock_manufactured_items_list($name);
@@ -349,10 +367,7 @@ class BoxReports
return sales_persons_list($name, null, _("No Sales Folk Filter"));
case 'TRANS_YEARS':
- $sql = "SELECT DISTINCT YEAR(tran_date) AS tran_date, YEAR(tran_date) AS tran_date2 FROM ".TB_PREF."gl_trans";
- return combo_input($name, '', $sql, 'tran_date', 'tran_date2',array('order'=>array('tran_date')));
-// FIX shouldn't it be fiscal year selector?
-// return fiscalyears_list($name);
+ return fiscalyears_list($name);
case 'USERS':
$sql = "SELECT id, user_id FROM ".TB_PREF."users";
@@ -377,7 +392,6 @@ class Report
var $name;
var $ar_params;
var $controls;
- var $ctrl_handlers = array();
function Report($id, $name, $ar_params = null)
{