X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep102.php;h=62128b5022a543ce24c65fd69e1267ef7f80e4f2;hb=7fae690528df9b851fba309b71bf7c3b961c9dd9;hp=797f9bc70a066f3b55d063e3d9243e3d84826802;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git diff --git a/reporting/rep102.php b/reporting/rep102.php index 797f9bc7..62128b50 100644 --- a/reporting/rep102.php +++ b/reporting/rep102.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_CUSTPAYMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -27,7 +27,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); print_aged_customer_analysis(); -function get_invoices($costomer_id, $to) +function get_invoices($customer_id, $to) { $todate = date2sql($to); $PastDueDays1 = get_company_pref('past_due_days'); @@ -37,8 +37,8 @@ function get_invoices($costomer_id, $to) $value = "(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + " .TB_PREF."debtor_trans.ov_discount)"; - $due = "IF (".TB_PREF."debtor_trans.type=10,".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)"; - $sql = "SELECT ".TB_PREF."sys_types.type_name, ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference, + $due = "IF (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE.",".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)"; + $sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference, ".TB_PREF."debtor_trans.tran_date, $value as Balance, IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due, @@ -47,14 +47,12 @@ function get_invoices($costomer_id, $to) FROM ".TB_PREF."debtors_master, ".TB_PREF."payment_terms, - ".TB_PREF."debtor_trans, - ".TB_PREF."sys_types + ".TB_PREF."debtor_trans - WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."debtor_trans.type - AND ".TB_PREF."debtor_trans.type <> 13 - AND ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator + WHERE ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." + AND ".TB_PREF."debtor_trans.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no - AND ".TB_PREF."debtor_trans.debtor_no = $costomer_id + AND ".TB_PREF."debtor_trans.debtor_no = $customer_id AND ".TB_PREF."debtor_trans.tran_date <= '$todate' AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) > 0.004 ORDER BY ".TB_PREF."debtor_trans.tran_date"; @@ -66,7 +64,7 @@ function get_invoices($costomer_id, $to) function print_aged_customer_analysis() { - global $comp_path, $path_to_root; + global $path_to_root, $systypes_array; $to = $_POST['PARAM_0']; $fromcust = $_POST['PARAM_1']; @@ -76,22 +74,16 @@ function print_aged_customer_analysis() $comments = $_POST['PARAM_5']; $destination = $_POST['PARAM_6']; if ($destination) - { include_once($path_to_root . "/reporting/includes/excel_report.inc"); - $filename = "AgedCustomerAnalysis.xml"; - } else - { include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - $filename = "AgedCustomerAnalysis.pdf"; - } if ($graphics) { include_once($path_to_root . "/reporting/includes/class.graphic.inc"); $pg = new graph(); } - if ($fromcust == reserved_words::get_all_numeric()) + if ($fromcust == ALL_NUMERIC) $from = _('All'); else $from = get_customer_name($fromcust); @@ -101,7 +93,7 @@ function print_aged_customer_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'); @@ -129,18 +121,18 @@ function print_aged_customer_analysis() if ($convert) $headers[2] = _('Currency'); - $rep = new FrontReport(_('Aged Customer Analysis'), $filename, user_pagesize()); + $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $total = array(0,0,0,0, 0); - $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; - if ($fromcust != reserved_words::get_all_numeric()) - $sql .= "WHERE debtor_no=$fromcust "; - $sql .= "ORDER BY name"; + $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master"; + if ($fromcust != ALL_NUMERIC) + $sql .= " WHERE debtor_no=".db_escape($fromcust); + $sql .= " ORDER BY name"; $result = db_query($sql, "The customers could not be retrieved"); while ($myrow=db_fetch($result)) @@ -182,10 +174,10 @@ function print_aged_customer_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->DateCol(2, 3, $trans['tran_date'], true, -2); - if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2) + if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT) { $trans['Balance'] *= -1; $trans['Due'] *= -1; @@ -236,14 +228,14 @@ function print_aged_customer_analysis() $pg->built_in = false; $pg->fontfile = $path_to_root . "/reporting/fonts/Vera.ttf"; $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != "."); - $filename = $comp_path .'/'. user_company(). "/images/test.png"; + $filename = company_path(). "/images/test.png"; $pg->display($filename, true); $w = $pg->width / 1.5; $h = $pg->height / 1.5; $x = ($rep->pageWidth - $w) / 2; $rep->NewLine(2); if ($rep->row - $h < $rep->bottomMargin) - $rep->Header(); + $rep->NewPage(); $rep->AddImage($filename, $x, $rep->row - $h, $w, $h); } $rep->NewLine();