projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Date Picker close when clicked outside of the datepicker. @kvvaradha and @apmuthu.
[fa-stable.git]
/
reporting
/
rep601.php
diff --git
a/reporting/rep601.php
b/reporting/rep601.php
index 1cedff0df8f07ef669516ba0d638e2a13f4d7c9e..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");
}
@@
-59,17
+59,20
@@
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
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');
@@
-82,6
+85,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();
@@
-112,6
+117,8
@@
function print_bank_transactions()
while ($myrow=db_fetch($trans))
{
while ($myrow=db_fetch($trans))
{
+ if ($zero == 0 && $myrow['amount'] == 0.0)
+ continue;
$total += $myrow['amount'];
$rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
$total += $myrow['amount'];
$rep->TextCol(0, 1, $systypes_array[$myrow["type"]]);
@@
-167,4
+174,3
@@
function print_bank_transactions()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file