Transaction references extended with parametrized patterns, added check_reference...

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

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index 8cb84044cc5c910c6d81ab643ea0ffd2ba32f0ee..f9b4d415181edc98a2a0bed25e1e982a3dab3312 100644 (file)
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -48,8 +48,6 @@ function get_fiscalyear($id)
 
 function get_current_fiscalyear()
 {
-       global $path_to_root;
-       include_once($path_to_root . "/admin/db/company_db.inc");
        $year = get_company_pref('f_year');
 
        $sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year);
@@ -130,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)
        {
@@ -159,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, 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();
@@ -190,11 +190,16 @@ function delete_attachments_and_comments($type_no, $trans_no)
        
        $sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no = $type_no AND trans_no = $trans_no";
        $result = db_query($sql, "Could not retrieve attachments");
+       $delflag = false;
        while ($row = db_fetch($result))
        {
+               $delflag = true;
                $dir =  company_path(). "/attachments";
                if (file_exists($dir."/".$row['unique_name']))
                        unlink($dir."/".$row['unique_name']);
+       }
+       if ($delflag)
+       {
                $sql = "DELETE FROM ".TB_PREF."attachments WHERE  type_no = $type_no AND trans_no = $trans_no";
                db_query($sql, "Could not delete attachment");
        }       
@@ -209,7 +214,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);
@@ -337,10 +342,8 @@ function delete_this_fiscalyear($selected_id)
        db_query($sql, "Could not delete exchange rates");
        $sql = "DELETE FROM ".TB_PREF."budget_trans WHERE tran_date <= '$to'";
        db_query($sql, "Could not delete exchange rates");
-       
        $sql = "SELECT account, SUM(amount) AS amount, person_type_id, person_id FROM "
                .TB_PREF."gl_trans WHERE tran_date <= '$to' GROUP by account, person_type_id, person_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);
 
@@ -360,16 +363,18 @@ function delete_this_fiscalyear($selected_id)
                                (".ST_JOURNAL.", $trans_no, '$to', '{$row['account']}', '$ref', {$row['amount']}, "
                                .db_escape($row['person_type_id'], true).", ".db_escape($row['person_id'], true).")";
                        db_query($sql, "Could not insert gl trans");
+                       $new = true;
                }
        }
        if ($new)
        {
                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";
@@ -418,4 +423,3 @@ function delete_this_fiscalyear($selected_id)
 }
 
 
-?>
\ No newline at end of file