projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update of sql statements, a couple of smaller fixes.
[fa-stable.git]
/
reporting
/
rep705.php
diff --git
a/reporting/rep705.php
b/reporting/rep705.php
index 341d6e5dd586ceb32b0e837b45de67152cffb8f4..a9ca35ea20d92f124668b15a7280ddb376ac8741 100644
(file)
--- a/
reporting/rep705.php
+++ b/
reporting/rep705.php
@@
-200,6
+200,7
@@
function print_annual_expense_breakdown()
$closeclass = false;
$convert = 1;
$closeclass = false;
$convert = 1;
+ $ctype = 0;
$accounts = get_gl_accounts_all(0);
$accounts = get_gl_accounts_all(0);
@@
-230,7
+231,7
@@
function print_annual_expense_breakdown()
{
for ( ; $level >= 0, $typename[$level] != ''; $level--)
{
{
for ( ; $level >= 0, $typename[$level] != ''; $level--)
{
- if ($account['parent'] == $closing[$level] || $account['parent'] < $last)
+ if ($account['parent'] == $closing[$level] || $account['parent'] < $last
|| $account['parent'] <= 0
)
{
$rep->row += 6;
$rep->Line($rep->row);
{
$rep->row += 6;
$rep->Line($rep->row);
@@
-282,8
+283,9
@@
function print_annual_expense_breakdown()
$rep->Line($rep->row);
$rep->NewLine();
}
$rep->Line($rep->row);
$rep->NewLine();
}
- $convert = get_account_class_convert($account['ClassID']);
$classname = $account['AccountClassName'];
$classname = $account['AccountClassName'];
+ $ctype = $account['ClassType'];
+ $convert = get_class_type_convert($ctype);
if ($account['account_code'] != null)
{
if ($account['account_code'] != null)
{
@@
-325,7
+327,7
@@
function print_annual_expense_breakdown()
{
for ( ; $level >= 0, $typename[$level] != ''; $level--)
{
{
for ( ; $level >= 0, $typename[$level] != ''; $level--)
{
- if ($account['parent'] == $closing[$level] || $account['parent'] < $last)
+ if ($account['parent'] == $closing[$level] || $account['parent'] < $last
|| $account['parent'] <= 0
)
{
$rep->row += 6;
$rep->Line($rep->row);
{
$rep->row += 6;
$rep->Line($rep->row);