Changed Journal Inquiries so it shows the Bank Deposit/Payment amount instead of...

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

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index abff8a968444b66bf5d265adac3ff0f019358c58..a974e4a2d2a09bdc4fc5343879cf81b4ff537e74 100644 (file)
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/admin/db/maintenance_db.inc");
 $js = "";
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Fiscal Years"), false, false, "", $js);
+page(_($help_context = "Fiscal Years"), false, false, "", $js);
 
 simple_page_mode(true);
 //---------------------------------------------------------------------------------------------
@@ -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;
@@ -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();