From 59117f09425181760d2c4d34888159cdbdabd24b Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 18 Sep 2008 09:38:11 +0000 Subject: [PATCH] New Report - Bank Statement --- CHANGELOG.txt | 5 ++ reporting/rep601.php | 137 +++++++++++++++++++++++++++++++++++++ reporting/reports_main.php | 10 +-- 3 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 reporting/rep601.php diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 900bbbef..cb5f33e7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,11 @@ Legend: ! -> Note $ -> Affected files +18-Sep-2008 Joe Hunt ++ New Report - Bank Statement. +$ /reporting/reports_main.php + /reporting/rep601.php (new file) + 17-Sep-2008 Joe Hunt ! New PDF tcpdf.php file. Support for cid-0 fonts (Chinese, Japanese, Korean, CJK, Asian fonts) without embedding. New cid-0 fonts will be available for download when release 2.0.2 is shipping. Reduces file size enormouusly diff --git a/reporting/rep601.php b/reporting/rep601.php new file mode 100644 index 00000000..6124cc8e --- /dev/null +++ b/reporting/rep601.php @@ -0,0 +1,137 @@ += '$from' + AND trans_date <= '$to' + AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id + ORDER BY trans_date,".TB_PREF."bank_trans.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()); + + $acc = $_POST['PARAM_0']; + $from = $_POST['PARAM_1']; + $to = $_POST['PARAM_2']; + $comments = $_POST['PARAM_3']; + + $dec = user_price_dec(); + + $cols = array(0, 90, 110, 170, 230, 300, 380, 430, 490, 550); + + $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'); + + $headers = array(_('Type'), _('#'), _('Reference'), _('Date'), _('Type'), _('Person/Item'), + _('Debit'), _('Credit'), _('Balance')); + + $account = get_bank_account($acc); + $act = $account['bank_account_name']." - ".$account['bank_curr_code']." - ".$account['bank_account_number']; + $params = array( 0 => $comments, + 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), + 2 => array('text' => _('Bank Account'),'from' => $act,'to' => '')); + + $rep->Font(); + $rep->Info($params, $cols, $headers, $aligns); + $rep->Header(); + + + $prev_balance = get_bank_balance_to($from, $account["account_code"]); + + $trans = get_bank_transactions($from, $to, $account['account_code']); + + $rows = db_num_rows($trans); + if ($prev_balance != 0.0 || $rows != 0) + { + $rep->Font('bold'); + $rep->TextCol(0, 3, $act); + $rep->TextCol(3, 5, _('Opening Balance')); + if ($prev_balance > 0.0) + $rep->TextCol(6, 7, number_format2(abs($prev_balance), $dec)); + else + $rep->TextCol(7, 8, number_format2(abs($prev_balance), $dec)); + $rep->Font(); + $total = $prev_balance; + $rep->NewLine(2); + if ($rows > 0) + { + while ($myrow=db_fetch($trans)) + { + $total += $myrow['amount']; + + $rep->TextCol(0, 1, systypes::name($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, $myrow['BankTransType']); + $rep->TextCol(5, 6, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false)); + if ($myrow['amount'] > 0.0) + $rep->TextCol(6, 7, number_format2(abs($myrow['amount']), $dec)); + else + $rep->TextCol(7, 8, number_format2(abs($myrow['amount']), $dec)); + $rep->TextCol(8, 9, number_format2($total, $dec)); + $rep->NewLine(); + if ($rep->row < $rep->bottomMargin + $rep->lineHeight) + { + $rep->Line($rep->row - 2); + $rep->Header(); + } + } + $rep->NewLine(); + } + $rep->Font('bold'); + $rep->TextCol(3, 5, _("Ending Balance")); + if ($total > 0.0) + $rep->TextCol(6, 7, number_format2(abs($total), $dec)); + else + $rep->TextCol(7, 8, number_format2(abs($total), $dec)); + $rep->Font(); + $rep->Line($rep->row - $rep->lineHeight + 4); + $rep->NewLine(2, 1); + } + $rep->End(); +} + +?> \ No newline at end of file diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 3609553d..580f3660 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -152,11 +152,11 @@ if ($dim > 0) // new ReportParam(_('Comments'),'TEXTBOX'))); } $reports->addReportClass(_('Banking')); -//$reports->addReport(_('Banking'),601,_('Bank Account Transactions'), -// array( new ReportParam(_('Bank Accounts'),'BANK_ACCOUNTS'), -// new ReportParam(_('Start Date'),'DATE'), -// new ReportParam(_('End Date'),'DATE'), -// new ReportParam(_('Comments'),'TEXTBOX'))); + $reports->addReport(_('Banking'),601,_('Bank Statement'), + array( new ReportParam(_('Bank Accounts'),'BANK_ACCOUNTS'), + new ReportParam(_('Start Date'),'DATEBEGINM'), + new ReportParam(_('End Date'),'DATEENDM'), + new ReportParam(_('Comments'),'TEXTBOX'))); $reports->addReportClass(_('General Ledger')); $reports->addReport(_('General Ledger'),701,_('Chart of Accounts'), -- 2.30.2