Moving 2.0 development version to main trunk.

[fa-stable.git] / gl / manage / bank_trans_types.php

diff --git a/gl/manage/bank_trans_types.php b/gl/manage/bank_trans_types.php
index bc9efacd755acaa01a605d7540e044ebb595d738..6c5b1dd7267eb0599045d82681de4fcbe0c7e56f 100644 (file)
--- a/gl/manage/bank_trans_types.php
+++ b/gl/manage/bank_trans_types.php
@@ -11,19 +11,10 @@ include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-if (isset($_GET['selected_id']))
-{
-       $selected_id = $_GET['selected_id'];
-} 
-elseif(isset($_POST['selected_id']))
-{
-       $selected_id = $_POST['selected_id'];
-}
-else
-       $selected_id = -1;
+simple_page_mode();
 //-----------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) 
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
        //initialise no input errors assumed initially before we test
@@ -33,6 +24,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
        {
                $input_error = 1;
                display_error( _("The bank transaction type name cannot be empty."));
+               set_focus('name');
        }
 
        if ($input_error != 1) 
@@ -40,17 +32,15 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                
        if ($selected_id != -1) 
        {
-               
                update_bank_trans_type($selected_id, $_POST['name']);
-    
+                       display_notification(_('Selected bank account settings has been updated'));
        } 
        else 
        {
-    
-               add_bank_trans_type($_POST['name']);
+                       add_bank_trans_type($_POST['name']);
+                       display_notification(_('New bank account has been added'));
        }
-               
-               meta_forward($_SERVER['PHP_SELF']);     
+               $Mode = 'RESET';
        }
 } 
 
@@ -75,25 +65,30 @@ function can_delete($selected_id)
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if( $Mode == 'Delete')
 {
-
        if (can_delete($selected_id))
        {
                delete_bank_trans_type($selected_id);
-               meta_forward($_SERVER['PHP_SELF']);             
+               display_notification(_('Selected bank account has been deleted'));
        }
+       $Mode = 'RESET';
 }
 
+if ($Mode == 'RESET')
+{
+       $selected_id = -1;
+       $_POST['name']  = '';
+}
 //-----------------------------------------------------------------------------------
 
 $result = get_all_bank_trans_type();
 
+start_form();
 start_table($table_style);
 
 $th = array(_("Description"), "", "");
 table_header($th);
-
 $k = 0;
 while ($myrow = db_fetch($result)) 
 {
@@ -101,17 +96,16 @@ while ($myrow = db_fetch($result))
        alt_table_row_color($k);        
 
        label_cell($myrow["name"]);
-       edit_link_cell("selected_id=" . $myrow["id"]);
-       delete_link_cell("selected_id=" . $myrow["id"]. "&delete=1");
+
+       edit_button_cell("Edit".$myrow["id"], _("Edit"));
+       edit_button_cell("Delete".$myrow["id"], _("Delete"));
        end_row(); 
 }
-
 end_table();
-
+end_form();
+echo '<br>';
 //-----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Bank Transaction Type"));
-
 start_form();
 
 start_table($table_style2);
@@ -119,19 +113,19 @@ start_table($table_style2);
 if ($selected_id != -1) 
 {
        //editing an existing status code
-
-       $myrow = get_bank_trans_type($selected_id);
-
-       $_POST['name']  = $myrow["name"];
-
+       if ($Mode == 'Edit') {
+               $myrow = get_bank_trans_type($selected_id);
+               $_POST['name']  = $myrow["name"];
+       }
        hidden('selected_id', $selected_id);
 } 
 
+set_focus('name');
 text_row_ex(_("Description:"), 'name', 40);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1);
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();