projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrong presentation of left to allocate if discount was given
[fa-stable.git]
/
reporting
/
rep707.php
diff --git
a/reporting/rep707.php
b/reporting/rep707.php
index df551fc36fd1770359b7505b830e71b8c2b936df..e19c29fee14db86c90259da0cd401424eea9bb68 100644
(file)
--- a/
reporting/rep707.php
+++ b/
reporting/rep707.php
@@
-156,6
+156,7
@@
function print_profit_and_loss_statement()
$closeclass = false;
$convert = 1;
$closeclass = false;
$convert = 1;
+ $ctype = 0;
$accounts = get_gl_accounts_all(0);
$accounts = get_gl_accounts_all(0);
@@
-190,7
+191,7
@@
function print_profit_and_loss_statement()
{
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);
@@
-248,9
+249,10
@@
function print_profit_and_loss_statement()
$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)
{
//$per_balance *= -1;
if ($account['account_code'] != null)
{
//$per_balance *= -1;
@@
-292,7
+294,7
@@
function print_profit_and_loss_statement()
{
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);