Fixed typos in installer translation files, fixed translations in dashboard procedures.

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

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index 0d9a9d21646f463349790225860b1c1649f99004..c65524f3d3f0364e26406e76fbb5b2609721296a 100644 (file)
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -9,6 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+require_once($path_to_root. "/includes/ui/items_cart.inc");
 
 // fiscal year routines
 function add_fiscalyear($from_date, $to_date, $closed)
@@ -128,6 +129,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 +160,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, sql2date($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();
@@ -212,7 +215,7 @@ function delete_this_fiscalyear($selected_id)
 {
        global $db_connections;
        
-       db_backup($db_connections[$_SESSION["wa_current_user"]->company], 'Security backup before Fiscal Year Removal');
+       db_backup($db_connections[user_company()], 'Security backup before Fiscal Year Removal');
        begin_transaction();
        $ref = _("Open Balance");
        $myrow = get_fiscalyear($selected_id);
@@ -368,10 +371,11 @@ 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_);
+               $Refs->save($trans_type, $trans_no, $reference);
+               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";