X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=b4ffa5c323e1a9982274babeb0820f7455ea9e55;hb=fa600790f955f0a95856ea4c2327d1230e35c083;hp=98e58324b462380499f0cbe16914ac7693dec1f8;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 98e58324..b4ffa5c3 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -44,15 +44,17 @@ class BoxReports $style = $class_counter==$_REQUEST['Class'] ? '' : "style='display:none'"; $acc = access_string($key); $st_classes .= "$acc[0]
"; + .$_SERVER['PHP_SELF']."?Class=$class_counter'" + ." class='menu_option' id='".default_focus()."'" + ." onclick='return showClass($class_counter);'$acc[1]>$acc[0]
"; $st_reports .= "\n"; foreach($value as $report) { $acc = access_string($report->name); $st_reports .= "
" . _("Reports For Class: ") . " $key
id" - ."'$acc[1]>$acc[0]
\n"; + .$_SERVER['PHP_SELF']."?Class=$class_counter&rep_id=$report->id'" + ." id='".default_focus()."'" + ."$acc[1]>$acc[0]
\n"; if (isset($_REQUEST['rep_id']) && $_REQUEST['rep_id']==$report->id) { $action = $path_to_root.'/reporting/prn_redirect.php'; @@ -61,10 +63,11 @@ class BoxReports . "
\n"; $st_params .= hidden('REP_ID', $report->id, false); $st_params .= submit('Rep'.$report->id, - _("Display: ") . access_string($report->name,true), - false, '', $pdf_debug==0) . '

'; + _("Display: ") . access_string($report->name, true), + false, '', $pdf_debug ? false : 'default') . '

'; $st_params .= $report->getDisplay() . "\n
\n"; + set_focus('Rep'.$report->id); $Ajax->addUpdate(true, 'rep_form', $st_params); } } @@ -119,7 +122,7 @@ class Report function getDisplay() { - global $path_to_root, $use_date_picker, $pdf_debug; + global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no; $st = ''; $dummy = ""; @@ -160,8 +163,9 @@ class Report $date = $edate; else { - $bdate = add_months($edate, -$row['tax_prd'] + 1); - $date = begin_month($bdate); + $bdate = begin_month($edate); + $bdate = add_months($bdate, -$row['tax_prd'] + 1); + $date = $bdate; } } $name = "PARAM_$index"; @@ -180,6 +184,10 @@ class Report $sel = array(_("No Payment Link"), "PayPal"); $st .= dup_simple_name_list("PARAM_$index", $sel); break; + case 'DESTINATION': + $sel = array(_("PDF/Printer"), "Excel"); + $st .= dup_simple_name_list("PARAM_$index", $sel); + break; case 'COMPARE': $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget")); $st .= dup_simple_name_list("PARAM_$index", $sel); @@ -189,7 +197,8 @@ class Report $st .= dup_simple_name_list("PARAM_$index", $sel); break; case 'SYS_TYPES': - $st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), true); + case 'SYS_TYPES_ALL': + $st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), ($param->param_type=='SYS_TYPES_ALL')); break; case 'TEXT': $st .= ""; @@ -210,27 +219,27 @@ class Report $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; case 'DIMENSION': - $sql = "SELECT reference, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions ORDER BY reference"; + $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions ORDER BY reference"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; case 'DIMENSIONS': - $sql = "SELECT reference, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions ORDER BY reference"; + $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions ORDER BY reference"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); break; case 'DIMENSION1': - $sql = "SELECT reference, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; + $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index". "_$index", $dummy); break; case 'DIMENSIONS1': - $sql = "SELECT reference, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; + $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); break; case 'DIMENSION2': - $sql = "SELECT reference, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; + $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; case 'DIMENSIONS2': - $sql = "SELECT reference, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; + $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); break; case 'CUSTOMERS_NO_FILTER': @@ -252,9 +261,14 @@ class Report case 'INVOICE': $IV = _("IV"); $CN = _("CN"); - $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', - ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; + if ($print_invoice_no == 1) + $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', + ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, 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"; + else + $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', + ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.reference, 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"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; case 'DELIVERY': @@ -263,14 +277,22 @@ class Report concat(".TB_PREF."debtor_trans.trans_no, '-', ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, ' $DN ', ".TB_PREF."debtors_master.name) as IName FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans - WHERE type=13 AND ".TB_PREF."debtors_master.debtor_no=". + WHERE type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtors_master.debtor_no=". TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; case 'ORDERS': $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-', ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no ORDER BY ".TB_PREF."sales_orders.order_no DESC"; + FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no + AND ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." ORDER BY ".TB_PREF."sales_orders.order_no DESC"; + $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + break; + case 'QUOTATIONS': + $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-', + ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no + AND ".TB_PREF."sales_orders.trans_type=".ST_SALESQUOTE." ORDER BY ".TB_PREF."sales_orders.order_no DESC"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; case 'PO': @@ -283,6 +305,12 @@ class Report $sql = "SELECT stock_id, concat(stock_id, '-', description) as name FROM ".TB_PREF."stock_master WHERE (mb_flag='A' OR mb_flag='M') ORDER BY stock_id"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; + case 'WORKORDER': + $sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-', + ".TB_PREF."stock_master.description) as IName + FROM ".TB_PREF."stock_master, ".TB_PREF."workorders WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id ORDER BY ".TB_PREF."workorders.id DESC"; + $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + break; case 'LOCATIONS': $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations ORDER BY location_name"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Location Filter"), false); @@ -307,6 +335,10 @@ class Report $sql = "SELECT DISTINCT YEAR(tran_date), YEAR(tran_date) FROM ".TB_PREF."gl_trans"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); break; + case 'USERS': + $sql = "SELECT id, user_id FROM ".TB_PREF."users ORDER BY user_id"; + $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Users Filter"), true); + break; case 'ACCOUNTS_NO_FILTER': $sql = "SELECT id, name FROM ".TB_PREF."chart_types ORDER BY name"; $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); @@ -343,9 +375,9 @@ function dup_simple_codeandname_list($sql, $name, &$selected_id, if ($all_option == true) { if ($all_option_numeric) - $reserved_word = reserved_words::get_all_numeric(); + $reserved_word = ALL_NUMERIC; else - $reserved_word = reserved_words::get_all(); + $reserved_word = ALL_TEXT; if ($reserved_word == $selected_id) { @@ -398,14 +430,14 @@ function dup_simple_name_list($name, $selections) //------------------------------------------------------------------------------------------------ -function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null) +function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null, $all_types=false) { global $systypes_array; $st = ""; return $st;