projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0004216] Print Work Orders: database error fixed when voided WO is in selected range.
[fa-stable.git]
/
reporting
/
rep601.php
diff --git
a/reporting/rep601.php
b/reporting/rep601.php
index db85e6686015a1f1be3c82e2bb891d88bf1842a9..1614e1166404be545dca9454cce5191626128783 100644
(file)
--- a/
reporting/rep601.php
+++ b/
reporting/rep601.php
@@
-43,11
+43,11
@@
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";
+ 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");
}
@@
-72,7
+72,7
@@
function print_bank_transactions()
$rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation);
$dec = user_price_dec();
$rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation);
$dec = user_price_dec();
- $cols = array(0, 90, 1
1
0, 170, 225, 350, 400, 460, 520);
+ $cols = array(0, 90, 1
2
0, 170, 225, 350, 400, 460, 520);
$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
$aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
@@
-174,4
+174,3
@@
function print_bank_transactions()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file