X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep202.php;h=97156dc513ccc06ec51dd6e78f77230421b8096b;hb=2cb57633d2f3e27b0c2b2e7448564f467e21e1fd;hp=8e20018d6c3bf1dede5275a02020e1d3caf8a9aa;hpb=45b9663b6305cb70c2f3f1782406232d3ed0d755;p=fa-stable.git diff --git a/reporting/rep202.php b/reporting/rep202.php index 8e20018d..97156dc5 100644 --- a/reporting/rep202.php +++ b/reporting/rep202.php @@ -1,15 +1,15 @@ . + See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPLIERANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_aged_supplier_analysis(); //---------------------------------------------------------------------------------------------------- @@ -38,8 +37,8 @@ function get_invoices($supplier_id, $to) // Revomed allocated from sql $value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; - $due = "IF (".TB_PREF."supp_trans.type=20 OR ".TB_PREF."supp_trans.type=21,".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; - $sql = "SELECT ".TB_PREF."sys_types.type_name, + $due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; + $sql = "SELECT ".TB_PREF."supp_trans.type, ".TB_PREF."supp_trans.reference, ".TB_PREF."supp_trans.tran_date, $value as Balance, @@ -49,11 +48,9 @@ function get_invoices($supplier_id, $to) FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms, - ".TB_PREF."supp_trans, - ".TB_PREF."sys_types + ".TB_PREF."supp_trans - WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type - AND ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator + WHERE ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id AND ".TB_PREF."supp_trans.supplier_id = $supplier_id AND ".TB_PREF."supp_trans.tran_date <= '$todate' @@ -68,9 +65,7 @@ function get_invoices($supplier_id, $to) function print_aged_supplier_analysis() { - global $comp_path, $path_to_root; - - include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + global $comp_path, $path_to_root, $systypes_array; $to = $_POST['PARAM_0']; $fromsupp = $_POST['PARAM_1']; @@ -78,13 +73,18 @@ function print_aged_supplier_analysis() $summaryOnly = $_POST['PARAM_3']; $graphics = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); if ($graphics) { include_once($path_to_root . "/reporting/includes/class.graphic.inc"); $pg = new graph(); } - if ($fromsupp == reserved_words::get_all_numeric()) + if ($fromsupp == ALL_NUMERIC) $from = _('All'); else $from = get_supplier_name($fromsupp); @@ -94,7 +94,7 @@ function print_aged_supplier_analysis() $summary = _('Summary Only'); else $summary = _('Detailed Report'); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home Currency'); @@ -122,7 +122,7 @@ function print_aged_supplier_analysis() if ($convert) $headers[2] = _('currency'); - $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis.pdf", user_pagesize()); + $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -138,7 +138,7 @@ function print_aged_supplier_analysis() $pastdue2 = _('Over') . " " . $PastDueDays2 . " " . _('Days'); $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers "; - if ($fromsupp != reserved_words::get_all_numeric()) + if ($fromsupp != ALL_NUMERIC) $sql .= "WHERE supplier_id=$fromsupp "; $sql .= "ORDER BY supp_name"; $result = db_query($sql, "The suppliers could not be retrieved"); @@ -148,11 +148,11 @@ function print_aged_supplier_analysis() if (!$convert && $currency != $myrow['curr_code']) continue; $rep->fontSize += 2; - $rep->TextCol(0, 3, $myrow['name']); + $rep->TextCol(0, 2, $myrow['name']); if ($convert) { $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to); - $rep->TextCol(2, 4, $myrow['curr_code']); + $rep->TextCol(2, 3, $myrow['curr_code']); } else $rate = 1.0; @@ -165,13 +165,13 @@ function print_aged_supplier_analysis() $total[2] += ($supprec["Overdue1"]-$supprec["Overdue2"]); $total[3] += $supprec["Overdue2"]; $total[4] += $supprec["Balance"]; - $str = array(number_format2(($supprec["Balance"] - $supprec["Due"]),$dec), - number_format2(($supprec["Due"]-$supprec["Overdue1"]),$dec), - number_format2(($supprec["Overdue1"]-$supprec["Overdue2"]) ,$dec), - number_format2($supprec["Overdue2"],$dec), - number_format2($supprec["Balance"],$dec)); + $str = array($supprec["Balance"] - $supprec["Due"], + $supprec["Due"]-$supprec["Overdue1"], + $supprec["Overdue1"]-$supprec["Overdue2"], + $supprec["Overdue2"], + $supprec["Balance"]); for ($i = 0; $i < count($str); $i++) - $rep->TextCol($i + 3, $i + 4, $str[$i]); + $rep->AmountCol($i + 3, $i + 4, $str[$i], $dec); $rep->NewLine(1, 2); if (!$summaryOnly) { @@ -182,18 +182,18 @@ function print_aged_supplier_analysis() while ($trans=db_fetch($res)) { $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name'], -2); + $rep->TextCol(0, 1, $systypes_array[$trans['type']], -2); $rep->TextCol(1, 2, $trans['reference'], -2); $rep->TextCol(2, 3, sql2date($trans['tran_date']), -2); foreach ($trans as $i => $value) $trans[$i] *= $rate; - $str = array(number_format2(($trans["Balance"] - $trans["Due"]),$dec), - number_format2(($trans["Due"]-$trans["Overdue1"]),$dec), - number_format2(($trans["Overdue1"]-$trans["Overdue2"]) ,$dec), - number_format2($trans["Overdue2"],$dec), - number_format2($trans["Balance"],$dec)); + $str = array($trans["Balance"] - $trans["Due"], + $trans["Due"]-$trans["Overdue1"], + $trans["Overdue1"]-$trans["Overdue2"], + $trans["Overdue2"], + $trans["Balance"]); for ($i = 0; $i < count($str); $i++) - $rep->TextCol($i + 3, $i + 4, $str[$i]); + $rep->AmountCol($i + 3, $i + 4, $str[$i], $dec); } $rep->Line($rep->row - 8); $rep->NewLine(2); @@ -209,13 +209,14 @@ function print_aged_supplier_analysis() $rep->fontSize -= 2; for ($i = 0; $i < count($total); $i++) { - $rep->TextCol($i + 3, $i + 4, number_format2($total[$i], $dec)); + $rep->AmountCol($i + 3, $i + 4, $total[$i], $dec); if ($graphics && $i < count($total) - 1) { $pg->y[$i] = abs($total[$i]); } } $rep->Line($rep->row - 8); + $rep->NewLine(); if ($graphics) { global $decseps, $graph_skin;