projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimizing some reports.
[fa-stable.git]
/
reporting
/
rep115.php
diff --git
a/reporting/rep115.php
b/reporting/rep115.php
index 74ef3c0a63bcaecf89c804b77286ffb578a0d1be..ee03bf8a8fa06dbea9ed905ae3392724ba8c369d 100644
(file)
--- a/
reporting/rep115.php
+++ b/
reporting/rep115.php
@@
-1,6
+1,6
@@
<?php
/**********************************************************************
<?php
/**********************************************************************
- Copyright (C)
Boxygen, LLC, and
FrontAccounting Team.
+ Copyright (C) FrontAccounting Team.
Released under the terms of the GNU General Public License, GPL,
as published by the Free Software Foundation, either version 3
of the License, or (at your option) any later version.
Released under the terms of the GNU General Public License, GPL,
as published by the Free Software Foundation, either version 3
of the License, or (at your option) any later version.
@@
-114,7
+114,6
@@
function print_customer_balances()
$folk = $_POST['PARAM_4']; // added by Faisal to filter by sales person
$currency = $_POST['PARAM_5'];
$no_zeros = $_POST['PARAM_6'];
$folk = $_POST['PARAM_4']; // added by Faisal to filter by sales person
$currency = $_POST['PARAM_5'];
$no_zeros = $_POST['PARAM_6'];
- $hide_trans = 1;
$comments = $_POST['PARAM_7'];
$orientation = $_POST['PARAM_8'];
$destination = $_POST['PARAM_9'];
$comments = $_POST['PARAM_7'];
$orientation = $_POST['PARAM_8'];
$destination = $_POST['PARAM_9'];
@@
-156,17
+155,20
@@
function print_customer_balances()
if ($no_zeros) $nozeros = _('Yes');
else $nozeros = _('No');
if ($no_zeros) $nozeros = _('Yes');
else $nozeros = _('No');
- $cols = array(0, 70, 140, 180, 230, 270, 350, 445, 495, 555);
+ $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515);
+ //$cols = array(0, 70, 140, 180, 230, 270, 350, 445, 495, 555);
- $headers = array(_('Name'), '', '', _('Open Balance'),
'',
_('Debit'), _('Credit'), '', _('Balance'));
+ $headers = array(_('Name'), '', '', _('Open Balance'), _('Debit'), _('Credit'), '', _('Balance'));
- $aligns = array('left', 'left', 'left', 'right', '
left', '
right', 'right', 'right', 'right');
+ $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right', 'right');
$params = array( 0 => $comments,
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Customer'), 'from' => $cust, 'to' => ''),
$params = array( 0 => $comments,
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Customer'), 'from' => $cust, 'to' => ''),
- 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
- 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
+ 3 => array('text' => _('Sales Areas'), 'from' => $sarea, 'to' => ''),
+ 4 => array('text' => _('Sales Folk'), 'from' => $salesfolk, 'to' => ''),
+ 5 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
+ 6 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
$rep = new FrontReport(_('Customer Trial Balance'), "CustomerTB", user_pagesize(), 9, $orientation);
if ($orientation == 'L')
$rep = new FrontReport(_('Customer Trial Balance'), "CustomerTB", user_pagesize(), 9, $orientation);
if ($orientation == 'L')
@@
-230,13
+232,11
@@
function print_customer_balances()
$grandtotal[$i] += $init[$i];
}
$grandtotal[$i] += $init[$i];
}
- if ($no_zeros && $init[3] == 0) continue;
-
- if (db_num_rows($res) == 0)
+ if (db_num_rows($res) == 0 && !$no_zeros)
{
$rep->TextCol(0, 2, $myrow['name']);
$rep->AmountCol(3, 4, $init[3], $dec);
{
$rep->TextCol(0, 2, $myrow['name']);
$rep->AmountCol(3, 4, $init[3], $dec);
- $rep->AmountCol(
8, 9
, $init[3], $dec);
+ $rep->AmountCol(
7, 8
, $init[3], $dec);
//$rep->Line($rep->row - 2);
$rep->NewLine(1);
continue;
//$rep->Line($rep->row - 2);
$rep->NewLine(1);
continue;
@@
-277,12
+277,12
@@
function print_customer_balances()
}
$total[3] = $total[0] - $total[1];
}
}
$total[3] = $total[0] - $total[1];
}
-
+ if ($no_zeros && $total[3] == 0.0 && $curr_db == 0.0 && $curr_cr == 0.0) continue;
$rep->TextCol(0, 2, $myrow['name']);
$rep->AmountCol(3, 4, $total[3] + $curr_cr - $curr_db, $dec);
$rep->TextCol(0, 2, $myrow['name']);
$rep->AmountCol(3, 4, $total[3] + $curr_cr - $curr_db, $dec);
- $rep->AmountCol(
5, 6
, $curr_db, $dec);
- $rep->AmountCol(
6, 7
, $curr_cr, $dec);
- $rep->AmountCol(
8, 9
, $total[3], $dec);
+ $rep->AmountCol(
4, 5
, $curr_db, $dec);
+ $rep->AmountCol(
5, 6
, $curr_cr, $dec);
+ $rep->AmountCol(
7, 8
, $total[3], $dec);
//$rep->Line($rep->row - 2);
$rep->NewLine(1);
}
//$rep->Line($rep->row - 2);
$rep->NewLine(1);
}
@@
-294,9
+294,9
@@
function print_customer_balances()
$grandtotal[3] = $grandtotal[0] - $grandtotal[1];
$rep->AmountCol(3, 4, $grandtotal[3] - $tot_cur_db + $tot_cur_cr, $dec);
$grandtotal[3] = $grandtotal[0] - $grandtotal[1];
$rep->AmountCol(3, 4, $grandtotal[3] - $tot_cur_db + $tot_cur_cr, $dec);
- $rep->AmountCol(
5, 6
, $tot_cur_db, $dec);
- $rep->AmountCol(
6, 7
, $tot_cur_cr, $dec);
- $rep->AmountCol(
8, 9
, $grandtotal[3], $dec);
+ $rep->AmountCol(
4, 5
, $tot_cur_db, $dec);
+ $rep->AmountCol(
5, 6
, $tot_cur_cr, $dec);
+ $rep->AmountCol(
7, 8
, $grandtotal[3], $dec);
$rep->Line($rep->row - 6, 1);
$rep->NewLine();
$rep->End();
$rep->Line($rep->row - 6, 1);
$rep->NewLine();
$rep->End();