Access control system description.

[fa-stable.git] / admin / fiscalyears.php

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index e7a2ff7454ac754ef66276f63ae729f1639da0db..7a4b2a36c4104141affa3f0f665e6963facf148c 100644 (file)
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -86,7 +86,7 @@ function check_data()
 function close_year($year)
 {
        $co = get_company_prefs();
-       if ($co['retained_earnings_act'] == '' || $co['profit_loss_year_act'] == '')
+       if (get_gl_account($co['retained_earnings_act']) == false || get_gl_account($co['profit_loss_year_act']) == false)
        {
                display_error(_("The Retained Earnings Account or the Profit and Loss Year Account has not been set in System and General GL Setup"));
                return false;
@@ -262,14 +262,14 @@ function delete_this_fiscalyear($selected_id)
        $result = db_query($sql, "Could not retrieve debtor trans");
        while ($row = db_fetch($result))
        {
-               if ($row['type'] == 10)
+               if ($row['type'] == ST_SALESINVOICE)
                {
-                       $deliveries = get_parent_trans(10,$row['trans_no']);
+                       $deliveries = get_parent_trans(ST_SALESINVOICE,$row['trans_no']);
                        foreach ($deliveries as $delivery)
                        {
-                               $sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = $delivery AND debtor_trans_type = 13";
+                               $sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = $delivery AND debtor_trans_type = ".ST_CUSTDELIVERY;
                                db_query($sql, "Could not delete debtor trans details");
-                               $sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE trans_no = $delivery AND type = 13";
+                               $sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE trans_no = $delivery AND type = ".ST_CUSTDELIVERY;
                                db_query($sql, "Could not delete debtor trans");
                        }               
                }       
@@ -423,9 +423,7 @@ function display_fiscalyears()
                if ($myrow["id"] != $company_year) {
                        delete_button_cell("Delete".$myrow['id'], _("Delete"));
                        submit_js_confirm("Delete".$myrow['id'],
-                               sprintf(_("Are you sure you want to remove fiscal year
-                               '%s'-'%s'? All transactions are removed and converted into relevant
-                               balances. Do you want to continue ?"), $from, $to));
+                               sprintf(_("Are you sure you want to remove fiscal year %s - %s? All transactions are removed and converted into relevant balances. Do you want to continue ?"), $from, $to));
                } else
                        label_cell('');
                end_row();