projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Undefined 'no_zeroes' in rep115 line 235. Fixed.
[fa-stable.git]
/
reporting
/
rep601.php
diff --git
a/reporting/rep601.php
b/reporting/rep601.php
index 1cedff0df8f07ef669516ba0d638e2a13f4d7c9e..9acf1ce7305a7ffc7b9bf950bb52121ad4f36a08 100644
(file)
--- a/
reporting/rep601.php
+++ b/
reporting/rep601.php
@@
-32,7
+32,7
@@
print_bank_transactions();
function get_bank_balance_to($to, $account)
{
$to = date2sql($to);
function get_bank_balance_to($to, $account)
{
$to = date2sql($to);
- $sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='$account'
+ $sql = "SELECT SUM(amount
+charge
) FROM ".TB_PREF."bank_trans WHERE bank_act='$account'
AND trans_date < '$to'";
$result = db_query($sql, "The starting balance on hand could not be calculated");
$row = db_fetch_row($result);
AND trans_date < '$to'";
$result = db_query($sql, "The starting balance on hand could not be calculated");
$row = db_fetch_row($result);
@@
-43,11
+43,12
@@
function get_bank_transactions($from, $to, $account)
{
$from = date2sql($from);
$to = date2sql($to);
{
$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'
AND trans_date >= '$from'
AND trans_date <= '$to'
- ORDER BY trans_date,".TB_PREF."bank_trans.id";
+ AND (amount !=0 OR charge !=0)
+ ORDER BY trans_date, id";
return db_query($sql,"The transactions for '$account' could not be retrieved");
}
return db_query($sql,"The transactions for '$account' could not be retrieved");
}
@@
-59,22
+60,25
@@
function print_bank_transactions()
$acc = $_POST['PARAM_0'];
$from = $_POST['PARAM_1'];
$to = $_POST['PARAM_2'];
$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");
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();
$dec = user_price_dec();
- $cols = array(0, 90, 1
10, 170, 225, 350, 400, 460, 52
0);
+ $cols = array(0, 90, 1
20, 170, 225, 350, 400, 450, 500, 55
0);
- $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+ $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'
, 'right'
);
$headers = array(_('Type'), _('#'), _('Reference'), _('Date'), _('Person/Item'),
$headers = array(_('Type'), _('#'), _('Reference'), _('Date'), _('Person/Item'),
- _('Debit'), _('Credit'), _('Balance'));
+ _('Debit'), _('Credit'), _('
Fee'), _('
Balance'));
$account = get_bank_account($acc);
$act = $account['bank_account_name']." - ".$account['bank_curr_code']." - ".$account['bank_account_number'];
$account = get_bank_account($acc);
$act = $account['bank_account_name']." - ".$account['bank_curr_code']." - ".$account['bank_account_number'];
@@
-82,6
+86,8
@@
function print_bank_transactions()
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Bank Account'),'from' => $act,'to' => ''));
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->NewPage();
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->NewPage();
@@
-98,13
+104,13
@@
function print_bank_transactions()
$rep->TextCol(0, 3, $act);
$rep->TextCol(3, 5, _('Opening Balance'));
if ($prev_balance > 0.0)
$rep->TextCol(0, 3, $act);
$rep->TextCol(3, 5, _('Opening Balance'));
if ($prev_balance > 0.0)
- $rep->AmountCol(5, 6,
abs($prev_balance)
, $dec);
+ $rep->AmountCol(5, 6,
$prev_balance
, $dec);
else
else
- $rep->AmountCol(6, 7,
abs($prev_balance)
, $dec);
+ $rep->AmountCol(6, 7,
-$prev_balance
, $dec);
$rep->Font();
$total = $prev_balance;
$rep->NewLine(2);
$rep->Font();
$total = $prev_balance;
$rep->NewLine(2);
- $total_debit = $total_credit = 0;
+ $total_debit = $total_credit =
$charges =
0;
if ($rows > 0)
{
// Keep a running total as we loop through
if ($rows > 0)
{
// Keep a running total as we loop through
@@
-112,7
+118,11
@@
function print_bank_transactions()
while ($myrow=db_fetch($trans))
{
while ($myrow=db_fetch($trans))
{
- $total += $myrow['amount'];
+ if ($zero == 0 && $myrow['amount'] == 0.0)
+ continue;
+ $total += $myrow['amount']+$myrow['charge'];
+ $charges += $myrow['charge'];
+ $amount = abs($myrow['amount']);
$rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
$rep->TextCol(1, 2, $myrow['trans_no']);
$rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
$rep->TextCol(1, 2, $myrow['trans_no']);
@@
-121,15
+131,17
@@
function print_bank_transactions()
$rep->TextCol(4, 5, get_counterparty_name($myrow["type"], $myrow["trans_no"], false));
if ($myrow['amount'] > 0.0)
{
$rep->TextCol(4, 5, get_counterparty_name($myrow["type"], $myrow["trans_no"], false));
if ($myrow['amount'] > 0.0)
{
- $rep->AmountCol(5, 6,
abs($myrow['amount'])
, $dec);
- $total_debit +=
abs($myrow['amount'])
;
+ $rep->AmountCol(5, 6,
$amount
, $dec);
+ $total_debit +=
$amount
;
}
else
{
}
else
{
- $rep->AmountCol(6, 7,
abs($myrow['amount'])
, $dec);
- $total_credit +=
abs($myrow['amount'])
;
+ $rep->AmountCol(6, 7,
$amount
, $dec);
+ $total_credit +=
$amount
;
}
}
- $rep->AmountCol(7, 8, $total, $dec);
+ if ($myrow['charge'])
+ $rep->AmountCol(7, 8, -$myrow['charge'], $dec);
+ $rep->AmountCol(8, 9, $total, $dec);
$rep->NewLine();
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
$rep->NewLine();
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
@@
-141,17
+153,18
@@
function print_bank_transactions()
}
// Print totals for the debit and credit columns.
}
// Print totals for the debit and credit columns.
- $rep->TextCol(3, 5, _("Total Debit / Credit"));
+ $rep->TextCol(3, 5, _("Total Debit / Credit
/ Fees
"));
$rep->AmountCol(5, 6, $total_debit, $dec);
$rep->AmountCol(6, 7, $total_credit, $dec);
$rep->AmountCol(5, 6, $total_debit, $dec);
$rep->AmountCol(6, 7, $total_credit, $dec);
+ $rep->AmountCol(7, 8, -$charges, $dec);
$rep->NewLine(2);
$rep->Font('bold');
$rep->TextCol(3, 5, _("Ending Balance"));
if ($total > 0.0)
$rep->NewLine(2);
$rep->Font('bold');
$rep->TextCol(3, 5, _("Ending Balance"));
if ($total > 0.0)
- $rep->AmountCol(5, 6,
abs($total)
, $dec);
+ $rep->AmountCol(5, 6,
$total
, $dec);
else
else
- $rep->AmountCol(6, 7,
abs($total)
, $dec);
+ $rep->AmountCol(6, 7,
-$total
, $dec);
$rep->Font();
$rep->Line($rep->row - $rep->lineHeight + 4);
$rep->NewLine(2, 1);
$rep->Font();
$rep->Line($rep->row - $rep->lineHeight + 4);
$rep->NewLine(2, 1);
@@
-167,4
+180,3
@@
function print_bank_transactions()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file