Improved journal trans: added currency support, tax and source document date. Allowed...

[fa-stable.git] / admin / db / fiscalyears_db.inc

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index 459d16209c044950c2e6580d243869bd82432ed7..9051e47547faa3e49f84f1e0754b59dbb39605f7 100644 (file)
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -128,6 +128,8 @@ function check_years_before($date, $closed=false)
 //---------------------------------------------------------------------------------------------
 function close_year($year)
 {
+       global $Refs;
+
        $co = get_company_prefs();
        if (get_gl_account($co['retained_earnings_act']) == false || get_gl_account($co['profit_loss_year_act']) == false)
        {
@@ -157,15 +159,15 @@ function close_year($year)
 
        if ($balance != 0.0)
        {
-               $trans_type = ST_JOURNAL;
-               $trans_id = get_next_trans_no($trans_type);
-
-               add_gl_trans($trans_type, $trans_id, $to, $co['retained_earnings_act'],
-                       0, 0, _("Closing Year"), -$balance);
-               add_gl_trans($trans_type, $trans_id, $to, $co['profit_loss_year_act'],
-                       0, 0, _("Closing Year"), $balance);
-
-       }       
+               $cart = new items_cart(ST_JOURNAL);
+               $cart->reference = $Refs->get_next(ST_JOURNAL, null, $to);
+               $cart->tran_date = $cart->doc_date = $cart->event_date = $to;
+
+               $cart->add_gl_item($co['retained_earnings_act'], 0, 0, -$balance, _("Closing Year"), '', 0);
+               $cart->add_gl_item($co['profit_loss_year_act'], 0, 0, $balance, _("Closing Year"), '', 0);
+               $cart->memo_ = _("Closing Year");
+               write_journal_entries($cart);
+       }
        close_transactions($to);
 
        commit_transaction();
@@ -368,10 +370,10 @@ function delete_this_fiscalyear($selected_id)
        {
                global $Refs;
                $trans_type = ST_JOURNAL;
-               $reference = $Refs->get_next($trans_type);
-               $Refs->save($trans_type, $trans_no, $reference);
                $date_ = sql2date($to);
-
+               $reference = $Refs->get_next($trans_type, null, $date_);
+               add_journal($trans_type, $trans_no, $total, $date_, get_company_currency(), $reference);
+               $Refs->save($trans_type, $trans_no, $reference);
                add_audit_trail($trans_type, $trans_no, $date_);
        }
        $sql = "SELECT bank_act, SUM(amount) AS amount FROM ".TB_PREF."bank_trans WHERE trans_date <= '$to' GROUP BY bank_act";