X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Fincludes%2Freports_classes.inc;h=92e5a9eb70b34f7292689a5c56e939f4d737bf93;hb=05d1e1fc65fe68645b540e06884db0e9f24b1a21;hp=2faf00ae63bbb8ab73cc079464499032e852e22b;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 2faf00ae..92e5a9eb 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -49,6 +49,10 @@ class BoxReports { global $path_to_root, $pdf_debug, $Ajax; + if (find_submit('Rep') != -1) { + include($path_to_root.'/reporting/prn_redirect.php'); + return; + } $temp = array_values($this->ar_classes); $display_class = $class==null ? $temp[0] : $this->ar_classes[$class]; @@ -59,6 +63,8 @@ class BoxReports if (isset($_GET['Class'])) set_focus('class'.$_GET['Class']); + $cur_class = $_REQUEST['Class']; + foreach($this->ar_classes as $class_id => $name) { if (!isset($this->ar_reports[$class_id])) @@ -67,36 +73,36 @@ class BoxReports $acc = access_string($name); $st_classes .= "$acc[0]
"; - $style = $class_id==$_REQUEST['Class'] ? '' : "style='display:none'"; + $style = $class_id==$cur_class ? '' : "style='display:none'"; $st_reports .= "\n"; foreach($this->ar_reports[$class_id] as $rep_id => $report) { $acc = access_string($report->name); $st_reports .= "
" . _("Reports For Class: ") . " $name
id'" - ." style='font-weight:". (@$_GET['rep_id'] == $report->id ? 'bold' : 'normal')."'" + ." href='".$_SERVER['PHP_SELF']."?Class=$class_id&REP_ID=$report->id'" + ." style='font-weight:". (@$_REQUEST['REP_ID'] == $report->id ? 'bold' : 'normal')."'" ." id='".$id = default_focus()."'" ."$acc[1]>$acc[0]
\n"; - if (@$_REQUEST['rep_id'] == $report->id) { + if (@$_REQUEST['REP_ID'] == $report->id) { $Ajax->activate($id); } - if (isset($_REQUEST['rep_id']) && $_REQUEST['rep_id']==$report->id) { - - $action = $path_to_root.'/reporting/prn_redirect.php'; - + if (isset($_REQUEST['REP_ID']) && $_REQUEST['REP_ID']==$report->id) { + // parameters form + $action = $_SERVER['PHP_SELF']; $st_params = "
\n" . "
\n"; $st_params .= submit('Rep'.$report->id, _("Display: ") . access_string($report->name, true), false, '', $pdf_debug ? false : 'default process') . hidden('REP_ID', $report->id, false).'

'; $st_params .= $this->getOptions($report->get_controls(), $report->id); - $st_params .= "\n
\n"; + $st_params .= "\n" + ."\n
\n"; set_focus('Rep'.$report->id); $Ajax->addUpdate(true, 'rep_form', $st_params); } @@ -215,8 +221,7 @@ class BoxReports return yesno_list($name); case 'PAYMENT_LINK': - $sel = array(_("No payment Link"), "PayPal"); - return array_selector($name, null, $sel); + return payment_services($name, null); case 'DESTINATION': $sel = array(_("PDF/Printer"), "Excel"); @@ -281,31 +286,32 @@ class BoxReports case 'CUSTOMERS': $sql = "SELECT debtor_no, name FROM ".TB_PREF."debtors_master"; if ($type == 'CUSTOMERS_NO_FILTER') - return combo_input($name, '', $sql, 'debtor_no', 'name',array('spec_option'=>_("No Customer Filter"),'spec_id'=>ALL_NUMERIC)); -// FIX allitems numeric! -// return customer_list($name, null, _("No Customer Filter")); + return customer_list($name, null, _("No Customer Filter")); else - return combo_input($name, '', $sql, 'debtor_no', 'name', null); -// return customer_list($name); + return customer_list($name); case 'SUPPLIERS_NO_FILTER': case 'SUPPLIERS': $sql = "SELECT supplier_id, supp_name FROM ".TB_PREF."suppliers"; if ($type == 'SUPPLIERS_NO_FILTER') - return combo_input($name, '', $sql, 'supplier_id', 'supp_name',array('spec_option'=>_("No Supplier Filter"),'spec_id'=>ALL_NUMERIC)); -// FIX allitems numeric! -// return supplier_list($name, null, _("No Supplier Filter")); + return supplier_list($name, null, _("No Supplier Filter")); else - return combo_input($name, '', $sql, 'supplier_id', 'supp_name', null); -// return supplier_list($name); + return supplier_list($name); case 'INVOICE': $IV = $type_shortcuts[ST_SALESINVOICE]; + $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('$IV ', ".TB_PREF."debtor_trans.$ref,' ', ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." 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 'CREDIT': $CN = $type_shortcuts[ST_CUSTCREDIT]; $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_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." 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"; + ".TB_PREF."debtor_trans.type) AS TNO, concat('$CN ', ".TB_PREF."debtor_trans.$ref,' ', ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE 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 'DELIVERY': @@ -354,10 +360,9 @@ class BoxReports case 'RECEIPT': $BD = $type_shortcuts[ST_BANKDEPOSIT]; $CP = $type_shortcuts[ST_CUSTPAYMENT]; - $CN = $type_shortcuts[ST_CUSTCREDIT]; $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 + ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), ".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));