projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a093e88
)
Improved layout Reports Customer / Supplier Balances.
author
Joe
<unknown>
Wed, 1 Oct 2014 21:08:26 +0000
(23:08 +0200)
committer
Joe
<unknown>
Wed, 1 Oct 2014 21:08:26 +0000
(23:08 +0200)
reporting/rep101.php
patch
|
blob
|
history
reporting/rep201.php
patch
|
blob
|
history
diff --git
a/reporting/rep101.php
b/reporting/rep101.php
index 74b355d8dc81cfbe667126fb70ab4cf3fb614dc3..3584a0259ecf13cc398a66d344dffea56a2bbfdb 100644
(file)
--- a/
reporting/rep101.php
+++ b/
reporting/rep101.php
@@
-142,7
+142,6
@@
function print_customer_balances()
$sql .= "WHERE debtor_no=".db_escape($fromcust);
$sql .= " ORDER BY name";
$result = db_query($sql, "The customers could not be retrieved");
$sql .= "WHERE debtor_no=".db_escape($fromcust);
$sql .= " ORDER BY name";
$result = db_query($sql, "The customers could not be retrieved");
- $num_lines = 0;
while ($myrow = db_fetch($result))
{
while ($myrow = db_fetch($result))
{
@@
-166,7
+165,6
@@
function print_customer_balances()
$res = get_transactions($myrow['debtor_no'], $from, $to);
if ($no_zeros && db_num_rows($res) == 0) continue;
$res = get_transactions($myrow['debtor_no'], $from, $to);
if ($no_zeros && db_num_rows($res) == 0) continue;
- $num_lines++;
$rep->fontSize += 2;
$rep->TextCol(0, 2, $myrow['name']);
if ($convert)
$rep->fontSize += 2;
$rep->TextCol(0, 2, $myrow['name']);
if ($convert)
@@
-184,9
+182,11
@@
function print_customer_balances()
$grandtotal[$i] += $init[$i];
}
$rep->NewLine(1, 2);
$grandtotal[$i] += $init[$i];
}
$rep->NewLine(1, 2);
- if (db_num_rows($res)==0)
- continue;
$rep->Line($rep->row + 4);
$rep->Line($rep->row + 4);
+ if (db_num_rows($res)==0) {
+ $rep->NewLine(1, 2);
+ continue;
+ }
while ($trans = db_fetch($res))
{
if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
while ($trans = db_fetch($res))
{
if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
diff --git
a/reporting/rep201.php
b/reporting/rep201.php
index 1d25b8af6754c5aeb1089b014659ccab8d1898ca..3a1288ac5dd894e71fd0624892a22185813c9122 100644
(file)
--- a/
reporting/rep201.php
+++ b/
reporting/rep201.php
@@
-174,9
+174,11
@@
function print_supplier_balances()
$grandtotal[$i] += $init[$i];
}
$rep->NewLine(1, 2);
$grandtotal[$i] += $init[$i];
}
$rep->NewLine(1, 2);
- if (db_num_rows($res)==0) continue;
-
$rep->Line($rep->row + 4);
$rep->Line($rep->row + 4);
+ if (db_num_rows($res)==0) {
+ $rep->NewLine(1, 2);
+ continue;
+ }
while ($trans=db_fetch($res))
{
if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;
while ($trans=db_fetch($res))
{
if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;