Merged changes from main trunk up to 2.2.7

[fa-stable.git] / gl / gl_journal.php

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index d515b179b8825c7d7f1ae9478d38a7092ac67312..035de8ac0c22fe4990911eb3496ccd09aac087a0 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -118,10 +118,10 @@ function create_cart($type=0, $trans_no=0)
        } else {
                $cart->reference = $Refs->get_next(0);
                $cart->tran_date = new_doc_date();
+               if (!is_date_in_fiscalyear($cart->tran_date))
+                       $cart->tran_date = end_fiscalyear();
                $_POST['ref_original'] = -1;
        }
-       if (!is_date_in_fiscalyear($cart->tran_date))
-               $cart->tran_date = end_fiscalyear();
 
        $_POST['memo_'] = $cart->memo_;
        $_POST['ref'] = $cart->reference;