Merging changes up to 2.0.4

[fa-stable.git] / reporting / rep704.php

diff --git a/reporting/rep704.php b/reporting/rep704.php
index 856efecb10ca71400e508f63cb62c5fcc11e1bdd..794b053a1a54708a9d87fc07b92dbbf5a4625ba1 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -106,10 +106,10 @@ function print_GL_transactions()
                        $begin = "";
                else
                {
-                       if ($from < $begin)
-                               $begin = add_days($from, -1);
-                       else
-                               $begin = add_days(begin_fiscalyear(), -1);
+                       $begin = begin_fiscalyear();
+                       if (date1_greater_date2($begin, $from))
+                               $begin = $from;
+                       $begin = add_days($begin, -1);
                }
                $prev_balance = get_gl_balance_from_to($begin, $from, $account["account_code"], $dimension, $dimension2);