Merging version 2.1 RC to main trunk.

[fa-stable.git] / inventory / manage / item_categories.php

diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php
index d32ba2ea93cabee104e539a583c5fc29d62b281a..f5de480a4aed608016629daa26ec678815180550 100644 (file)
--- a/inventory/manage/item_categories.php
+++ b/inventory/manage/item_categories.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 11;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -10,18 +19,10 @@ include_once($path_to_root . "/includes/ui.inc");
 
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
-if (isset($_GET['selected_id']))
-{
-       $selected_id = strtoupper($_GET['selected_id']);
-} 
-else if (isset($_POST['selected_id']))
-{
-       $selected_id = strtoupper($_POST['selected_id']);
-}
-
+simple_page_mode(true);
 //----------------------------------------------------------------------------------
 
-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
@@ -31,25 +32,28 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
        {
                $input_error = 1;
                display_error(_("The item category description cannot be empty."));
+               set_focus('description');
        }
 
        if ($input_error !=1)
        {
-       if (isset($selected_id)) 
+       if ($selected_id != -1) 
        {
                    update_item_category($selected_id, $_POST['description']);                  
+                       display_notification(_('Selected item category has been updated'));
        } 
        else 
        {
                    add_item_category($_POST['description']);
+                       display_notification(_('New item category has been added'));
        }
-               meta_forward($_SERVER['PHP_SELF']); 
+               $Mode = 'RESET';
        }
 }
 
 //---------------------------------------------------------------------------------- 
 
-if (isset($_GET['delete'])) 
+if ($Mode == 'Delete')
 {
 
        // PREVENT DELETES IF DEPENDENT RECORDS IN 'stock_master'
@@ -59,20 +63,26 @@ if (isset($_GET['delete']))
        if ($myrow[0] > 0) 
        {
                display_error(_("Cannot delete this item category because items have been created using this item category."));
-
        } 
        else 
        {
                delete_item_category($selected_id);
-               meta_forward($_SERVER['PHP_SELF']);             
+               display_notification(_('Selected item category has been deleted'));
        }
+       $Mode = 'RESET';
 }
 
+if ($Mode == 'RESET')
+{
+       $selected_id = -1;
+       unset($_POST);
+}
 //----------------------------------------------------------------------------------
 
 $sql = "SELECT * FROM ".TB_PREF."stock_category";
 $result = db_query($sql, "could not get stock categories");
 
+start_form();
 start_table("$table_style width=30%");
 $th = array(_("Name"), "", "");
 table_header($th);
@@ -84,39 +94,38 @@ while ($myrow = db_fetch($result))
        alt_table_row_color($k);
 
        label_cell($myrow["description"]);
-       edit_link_cell(SID."selected_id=$myrow[0]");
-       delete_link_cell(SID."selected_id=$myrow[0]&delete=yes");
+       edit_button_cell("Edit".$myrow[0], _("Edit"));
+       delete_button_cell("Delete".$myrow[0], _("Delete"));
        end_row();
 }
 
 end_table();
-
+end_form();
+echo '<br>';
 //----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Item Category"));
-
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table($table_style2);
 
-if (isset($selected_id)) 
+if ($selected_id != -1) 
 {
-       //editing an existing item category
-
-       $myrow = get_item_category($selected_id);
-
-       $_POST['category_id'] = $myrow["category_id"];
-       $_POST['description']  = $myrow["description"];
+       if ($Mode == 'Edit') {
+               //editing an existing item category
+               $myrow = get_item_category($selected_id);
 
+               $_POST['category_id'] = $myrow["category_id"];
+               $_POST['description']  = $myrow["description"];
+       }
        hidden('selected_id', $selected_id);
-       hidden('category_id', $_POST['category_id']);
+       hidden('category_id');
 }
 
 text_row(_("Category Name:"), 'description', null, 30, 30);  
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));     
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();