This was bad idea. The problem should be solved on php side.

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

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index 269278889bdf84cbd83a6baa3f2f0887612c8b27..8dfe4a8f5197d6c084d6558e07f0c9ab45896337 100644 (file)
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -52,16 +52,15 @@ function handle_submit()
 {
        global $selected_id, $Mode;
 
-       if (!check_data())
-               return false;
-
        if ($selected_id != -1)
        {
-               update_fiscalyear($_POST['from_date'], $_POST['closed']);
+               update_fiscalyear($selected_id, $_POST['closed']);
                display_notification(_('Selected fiscal year has been updated'));
        }
        else
        {
+               if (!check_data())
+                       return false;
                add_fiscalyear($_POST['from_date'], $_POST['to_date'], $_POST['closed']);
                display_notification(_('New fiscal year has been added'));
        }
@@ -94,12 +93,11 @@ function handle_delete()
 {
        global $selected_id, $Mode;
 
-       if (!check_can_delete($selected_id))
-               return;
+       if (check_can_delete($selected_id)) {
        //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
-
-       delete_fiscalyear($selected_id);
-       display_notification(_('Selected fiscal year has been deleted'));
+               delete_fiscalyear($selected_id);
+               display_notification(_('Selected fiscal year has been deleted'));
+       }
        $Mode = 'RESET';
 }
 
@@ -144,6 +142,8 @@ function display_fiscalyears()
                edit_button_cell("Edit".$myrow['id'], _("Edit"));
                if ($myrow["id"] != $company_year)
                        edit_button_cell("Delete".$myrow['id'], _("Delete"));
+               else
+                       label_cell('');
                end_row();
        }