When deleting a fiscal year, the open balances should share the same trans no.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4b41399494252ba8e75b032f355f56186566a8f5..ccf88c08b529f992b21de9e3e9389bbbd5390d30 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+02-Dec-2010 Joe Hunt
+# When deleting a fiscal year, the open balances should share the same trans no.
+$ /admin/db/fiscalyear_db.inc
+
 01-Dec-2010 Joe Hunt
 ! Better test for correct balance accounts when closing fiscal year.
 $ /admin/db/fiscalyear_db.inc

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index ff4e4bcd3b7664ed72206df3585c4096ee5c5db6..b14ce5bad49527f0579292e92d545c9c6bf5cef7 100644 (file)
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -328,13 +328,13 @@ function delete_this_fiscalyear($selected_id)
        
        $sql = "SELECT account, SUM(amount) AS amount FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' GROUP by account";
        $result = db_query($sql, "Could not retrieve gl trans");
+       $trans_no = get_next_trans_no(ST_JOURNAL);
        while ($row = db_fetch($result))
        {
                $sql = "DELETE FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' AND account = '{$row['account']}'";
                db_query($sql, "Could not delete gl trans");
                if (is_account_balancesheet($row['account']))
                {
-                       $trans_no = get_next_trans_no(ST_JOURNAL);
                        $sql = "INSERT INTO ".TB_PREF."gl_trans (type, type_no, tran_date, account, memo_, amount) VALUES
                                (".ST_JOURNAL.", $trans_no, '$to', '{$row['account']}', '$ref', {$row['amount']})";
                        db_query($sql, "Could not insert gl trans");