X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep203.php;h=2a5c7bb089094d963f76abbe7e16accbe79c4fe6;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=078c7c0801bc8e147efcf730963314d6f1091543;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git diff --git a/reporting/rep203.php b/reporting/rep203.php index 078c7c08..2a5c7bb0 100644 --- a/reporting/rep203.php +++ b/reporting/rep203.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPPAYMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -25,30 +25,23 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_payment_report(); function getTransactions($supplier, $date) { $date = date2sql($date); - - $sql = "SELECT ".TB_PREF."sys_types.type_name, - ".TB_PREF."supp_trans.supp_reference, - ".TB_PREF."supp_trans.tran_date, - ".TB_PREF."supp_trans.due_date, - ".TB_PREF."supp_trans.trans_no, - ".TB_PREF."supp_trans.type, - ".TB_PREF."supp_trans.rate, - (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance, - (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal - FROM ".TB_PREF."supp_trans, - ".TB_PREF."sys_types - WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type - AND ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "' - AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0 - AND ".TB_PREF."supp_trans.tran_date <='" . $date . "' - ORDER BY ".TB_PREF."supp_trans.type, - ".TB_PREF."supp_trans.trans_no"; + $dec = user_price_dec(); + + $sql = "SELECT supp_reference, tran_date, due_date, trans_no, type, rate, + (ABS( ov_amount) + ABS( ov_gst) - alloc) AS Balance, + (ABS( ov_amount) + ABS( ov_gst) ) AS TranTotal + FROM ".TB_PREF."supp_trans + WHERE supplier_id = '$supplier' + AND ROUND(ABS( ov_amount),$dec) + ROUND(ABS( ov_gst),$dec) - + ROUND( alloc,$dec) != 0 + AND tran_date <='$date' + ORDER BY type, + trans_no"; return db_query($sql, "No transactions were returned"); } @@ -57,32 +50,29 @@ function getTransactions($supplier, $date) function print_payment_report() { - global $path_to_root; - - $to = $_POST['PARAM_0']; - $fromsupp = $_POST['PARAM_1']; - $currency = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - $destination = $_POST['PARAM_4']; + global $path_to_root, $systypes_array; + + $to = $_POST['PARAM_0']; + $fromsupp = $_POST['PARAM_1']; + $currency = $_POST['PARAM_2']; + $no_zeros = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; + $orientation = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; if ($destination) - { include_once($path_to_root . "/reporting/includes/excel_report.inc"); - $filename = "PaymentReport.xml"; - } else - { include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - $filename = "PaymentReport.pdf"; - } - if ($fromsupp == reserved_words::get_all_numeric()) + $orientation = ($orientation ? 'L' : 'P'); + if ($fromsupp == ALL_TEXT) $from = _('All'); else $from = get_supplier_name($fromsupp); - $dec = user_price_dec(); + $dec = user_price_dec(); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home Currency'); @@ -90,7 +80,10 @@ function print_payment_report() else $convert = false; - $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515); + if ($no_zeros) $nozeros = _('Yes'); + else $nozeros = _('No'); + + $cols = array(0, 100, 160, 210, 250, 320, 385, 450, 515); $headers = array(_('Trans Type'), _('#'), _('Due Date'), '', '', '', _('Total'), _('Balance')); @@ -98,56 +91,62 @@ function print_payment_report() $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right'); $params = array( 0 => $comments, - 1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''), - 2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''), - 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => '')); + 1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''), + 2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''), + 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => ''), + 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => '')); - $rep = new FrontReport(_('Payment Report'), "PaymentReport.pdf", user_pagesize()); + $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $total = array(); $grandtotal = array(0,0); $sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms WHERE "; - if ($fromsupp != reserved_words::get_all_numeric()) - $sql .= "supplier_id=$fromsupp AND "; + if ($fromsupp != ALL_TEXT) + $sql .= "supplier_id=".db_escape($fromsupp)." AND "; $sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator ORDER BY supp_name"; $result = db_query($sql, "The customers could not be retrieved"); while ($myrow=db_fetch($result)) { - if (!$convert && $currency != $myrow['curr_code']) - continue; + if (!$convert && $currency != $myrow['curr_code']) continue; + + $res = getTransactions($myrow['supplier_id'], $to); + if ($no_zeros && db_num_rows($res)==0) continue; + $rep->fontSize += 2; $rep->TextCol(0, 6, $myrow['name'] . " - " . $myrow['terms']); if ($convert) $rep->TextCol(6, 7, $myrow['curr_code']); $rep->fontSize -= 2; $rep->NewLine(1, 2); - $res = getTransactions($myrow['supplier_id'], $to); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); $total[0] = $total[1] = 0.0; while ($trans=db_fetch($res)) { - if ($convert) - $rate = $trans['rate']; - else - $rate = 1.0; + if ($no_zeros && $trans['TranTotal'] == 0 && $trans['Balance'] == 0) continue; + + if ($convert) $rate = $trans['rate']; + else $rate = 1.0; + $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name']); + $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['supp_reference']); - if ($trans['type'] == 20) + if ($trans['type'] == ST_SUPPINVOICE) $rep->DateCol(2, 3, $trans['due_date'], true); else $rep->DateCol(2, 3, $trans['tran_date'], true); - if ($trans['type'] != 20) + if ($trans['type'] != ST_SUPPINVOICE) { $trans['TranTotal'] = -$trans['TranTotal']; $trans['Balance'] = -$trans['Balance']; @@ -183,4 +182,3 @@ function print_payment_report() $rep->End(); } -?> \ No newline at end of file