X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep601.php;h=2566216c5b981fe229ae65ffe3b6d57d6f4f113f;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=66fbbf2abb8dffffd8e3eee0d3b5299c72e80947;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git diff --git a/reporting/rep601.php b/reporting/rep601.php index 66fbbf2a..2566216c 100644 --- a/reporting/rep601.php +++ b/reporting/rep601.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_BANKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -43,103 +43,143 @@ 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"; + AND amount <> 0 + 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; + global $path_to_root, $systypes_array; $acc = $_POST['PARAM_0']; $from = $_POST['PARAM_1']; $to = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - $destination = $_POST['PARAM_4']; + $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"); - $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize()); + $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'); $headers = array(_('Type'), _('#'), _('Reference'), _('Date'), _('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' => '')); + if ($orientation == 'L') + recalculate_cols($cols); + $sql = "SELECT id, bank_account_name, bank_curr_code, bank_account_number FROM ".TB_PREF."bank_accounts"; + if ($acc != ALL_TEXT) + $sql .= " WHERE id = $acc"; + $result = db_query($sql, "could not retreive bank accounts"); + while ($account=db_fetch($result)) + { + $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(); + $rep->Font(); + $rep->pageNumber = 0; + $rep->Info($params, $cols, $headers, $aligns); + $rep->NewPage(); - $prev_balance = get_bank_balance_to($from, $account["id"]); + $prev_balance = get_bank_balance_to($from, $account["id"]); - $trans = get_bank_transactions($from, $to, $account['id']); + $trans = get_bank_transactions($from, $to, $account['id']); - $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->AmountCol(5, 6, abs($prev_balance), $dec); - else - $rep->AmountCol(6, 7, abs($prev_balance), $dec); - $rep->Font(); - $total = $prev_balance; - $rep->NewLine(2); - if ($rows > 0) + $rows = db_num_rows($trans); + if ($prev_balance != 0.0 || $rows != 0) { - while ($myrow=db_fetch($trans)) + $rep->Font('bold'); + $rep->TextCol(0, 3, $act); + $rep->TextCol(3, 5, _('Opening Balance')); + if ($prev_balance > 0.0) + $rep->AmountCol(5, 6, abs($prev_balance), $dec); + else + $rep->AmountCol(6, 7, abs($prev_balance), $dec); + $rep->Font(); + $total = $prev_balance; + $rep->NewLine(2); + $total_debit = $total_credit = 0; + if ($rows > 0) { - $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->DateCol(3, 4, $myrow["trans_date"], true); - $rep->TextCol(4, 5, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false)); - if ($myrow['amount'] > 0.0) - $rep->AmountCol(5, 6, abs($myrow['amount']), $dec); - else - $rep->AmountCol(6, 7, abs($myrow['amount']), $dec); - $rep->AmountCol(7, 8, $total, $dec); - $rep->NewLine(); - if ($rep->row < $rep->bottomMargin + $rep->lineHeight) + // Keep a running total as we loop through + // the transactions. + + while ($myrow=db_fetch($trans)) { - $rep->Line($rep->row - 2); - $rep->Header(); + if ($zero == 0 && $myrow['amount'] == 0.0) + continue; + $total += $myrow['amount']; + + $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]); + $rep->TextCol(1, 2, $myrow['trans_no']); + $rep->TextCol(2, 3, $myrow['ref']); + $rep->DateCol(3, 4, $myrow["trans_date"], true); + $rep->TextCol(4, 5, payment_person_name($myrow["person_type_id"],$myrow["person_id"], false)); + if ($myrow['amount'] > 0.0) + { + $rep->AmountCol(5, 6, abs($myrow['amount']), $dec); + $total_debit += abs($myrow['amount']); + } + else + { + $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->NewPage(); + } } + $rep->NewLine(); } - $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->AmountCol(5, 6, abs($total), $dec); + else + $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->Font('bold'); - $rep->TextCol(3, 5, _("Ending Balance")); - if ($total > 0.0) - $rep->AmountCol(5, 6, abs($total), $dec); - else - $rep->AmountCol(6, 7, abs($total), $dec); - $rep->Font(); - $rep->Line($rep->row - $rep->lineHeight + 4); - $rep->NewLine(2, 1); } $rep->End(); } -?> \ No newline at end of file