X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=1614e1166404be545dca9454cce5191626128783;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=a6a178b5865a428c5694b16f95f84a91852fcc5b;hpb=ba80e275bd7d437b92dd62eec01d97e461c74bce;p=fa-stable.git diff --git a/reporting/rep601.php b/reporting/rep601.php index a6a178b5..1614e116 100644 --- a/reporting/rep601.php +++ b/reporting/rep601.php @@ -1,22 +1,30 @@ . +***********************************************************************/ +$page_security = 'SA_BANKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt // date_: 2005-05-19 // Title: Bank Accounts Transactions // ---------------------------------------------------------------- -$path_to_root="../"; +$path_to_root=".."; -include_once($path_to_root . "includes/session.inc"); -include_once($path_to_root . "includes/date_functions.inc"); -include_once($path_to_root . "includes/data_checks.inc"); -include_once($path_to_root . "gl/includes/gl_db.inc"); +include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/date_functions.inc"); +include_once($path_to_root . "/includes/data_checks.inc"); +include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_bank_transactions(); //---------------------------------------------------------------------------------------------------- @@ -35,31 +43,36 @@ function get_bank_transactions($from, $to, $account) { $from = date2sql($from); $to = date2sql($to); - $sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans - WHERE ".TB_PREF."bank_trans.bank_act = '$account' + $sql = "SELECT * FROM ".TB_PREF."bank_trans + WHERE bank_act = '$account' AND trans_date >= '$from' AND trans_date <= '$to' - ORDER BY trans_date,".TB_PREF."bank_trans.id"; + ORDER BY trans_date, id"; return db_query($sql,"The transactions for '$account' could not be retrieved"); } function print_bank_transactions() { - global $path_to_root; - - include_once($path_to_root . "reporting/includes/pdf_report.inc"); - - $rep = new FrontReport(_('Bank Statement'), "BankStatement.pdf", user_pagesize()); + global $path_to_root, $systypes_array; $acc = $_POST['PARAM_0']; $from = $_POST['PARAM_1']; $to = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - + $zero = $_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"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + + $orientation = ($orientation ? 'L' : 'P'); + $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation); $dec = user_price_dec(); - $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520); + $cols = array(0, 90, 120, 170, 225, 350, 400, 460, 520); $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'); @@ -72,9 +85,11 @@ function print_bank_transactions() 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), 2 => array('text' => _('Bank Account'),'from' => $act,'to' => '')); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $prev_balance = get_bank_balance_to($from, $account["id"]); @@ -88,48 +103,74 @@ function print_bank_transactions() $rep->TextCol(0, 3, $act); $rep->TextCol(3, 5, _('Opening Balance')); if ($prev_balance > 0.0) - $rep->TextCol(5, 6, number_format2(abs($prev_balance), $dec)); + $rep->AmountCol(5, 6, abs($prev_balance), $dec); else - $rep->TextCol(6, 7, number_format2(abs($prev_balance), $dec)); + $rep->AmountCol(6, 7, abs($prev_balance), $dec); $rep->Font(); $total = $prev_balance; $rep->NewLine(2); + $total_debit = $total_credit = 0; if ($rows > 0) { + // Keep a running total as we loop through + // the transactions. + while ($myrow=db_fetch($trans)) { + if ($zero == 0 && $myrow['amount'] == 0.0) + continue; $total += $myrow['amount']; - $rep->TextCol(0, 1, systypes::name($myrow["type"])); + $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]); $rep->TextCol(1, 2, $myrow['trans_no']); $rep->TextCol(2, 3, $myrow['ref']); - $rep->TextCol(3, 4, sql2date($myrow["trans_date"])); - $rep->TextCol(4, 5, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false)); + $rep->DateCol(3, 4, $myrow["trans_date"], true); + $rep->TextCol(4, 5, get_counterparty_name($myrow["type"], $myrow["trans_no"], false)); if ($myrow['amount'] > 0.0) - $rep->TextCol(5, 6, number_format2(abs($myrow['amount']), $dec)); + { + $rep->AmountCol(5, 6, abs($myrow['amount']), $dec); + $total_debit += abs($myrow['amount']); + } else - $rep->TextCol(6, 7, number_format2(abs($myrow['amount']), $dec)); - $rep->TextCol(7, 8, number_format2($total, $dec)); + { + $rep->AmountCol(6, 7, abs($myrow['amount']), $dec); + $total_credit += abs($myrow['amount']); + } + $rep->AmountCol(7, 8, $total, $dec); $rep->NewLine(); if ($rep->row < $rep->bottomMargin + $rep->lineHeight) { $rep->Line($rep->row - 2); - $rep->Header(); + $rep->NewPage(); } } $rep->NewLine(); } + + // Print totals for the debit and credit columns. + $rep->TextCol(3, 5, _("Total Debit / Credit")); + $rep->AmountCol(5, 6, $total_debit, $dec); + $rep->AmountCol(6, 7, $total_credit, $dec); + $rep->NewLine(2); + $rep->Font('bold'); $rep->TextCol(3, 5, _("Ending Balance")); if ($total > 0.0) - $rep->TextCol(5, 6, number_format2(abs($total), $dec)); + $rep->AmountCol(5, 6, abs($total), $dec); else - $rep->TextCol(6, 7, number_format2(abs($total), $dec)); + $rep->AmountCol(6, 7, abs($total), $dec); $rep->Font(); $rep->Line($rep->row - $rep->lineHeight + 4); $rep->NewLine(2, 1); + + // Print the difference between starting and ending balances. + $net_change = ($total - $prev_balance); + $rep->TextCol(3, 5, _("Net Change")); + if ($total > 0.0) + $rep->AmountCol(5, 6, $net_change, $dec, 0, 0, 0, 0, null, 1, True); + else + $rep->AmountCol(6, 7, $net_change, $dec, 0, 0, 0, 0, null, 1, True); } $rep->End(); } -?> \ No newline at end of file