X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fmovement_types.php;h=7f336b0de58f7564e573739bce8a1dc8e78a57a6;hb=113a0f4ffc2b8860505bcc26574e8b6e1dddab65;hp=4a2369e71afa6c599741c841f73c74e03cbf94bd;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php
index 4a2369e7..7f336b0d 100644
--- a/inventory/manage/movement_types.php
+++ b/inventory/manage/movement_types.php
@@ -1,27 +1,28 @@
 <?php
-
-$page_security = 3;
-$path_to_root="../..";
+/**********************************************************************
+    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 = 'SA_INVENTORYMOVETYPE';
+$path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Inventory Movement Types"));
+page(_($help_context = "Inventory Movement Types"));
 
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
 include_once($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'];
-}
-
+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,24 +32,23 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 	{
 		$input_error = 1;
 		display_error(_("The inventory movement type name cannot be empty."));
+		set_focus('name');
 	}
 
 	if ($input_error != 1) 
 	{
-		
-    	if (isset($selected_id)) 
+    	if ($selected_id != -1) 
     	{
-    		
     		update_movement_type($selected_id, $_POST['name']);
-    
+			display_notification(_('Selected movement type has been updated'));
     	} 
     	else 
     	{
-    
     		add_movement_type($_POST['name']);
+			display_notification(_('New movement type has been added'));
     	}
     	
-		meta_forward($_SERVER['PHP_SELF']);     	
+		$Mode = 'RESET';
 	}
 } 
 
@@ -56,11 +56,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 
 function can_delete($selected_id)
 {
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves 
-		WHERE type=" . systypes::inventory_adjustment(). " AND person_id=$selected_id";
-	$result = db_query($sql, "could not query stock moves");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (movement_types_in_stock_moves($selected_id))
 	{
 		display_error(_("Cannot delete this inventory movement type because item transactions have been created referring to it."));
 		return false;
@@ -72,23 +68,32 @@ function can_delete($selected_id)
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if ($Mode == 'Delete')
 {
-
 	if (can_delete($selected_id))
 	{
 		delete_movement_type($selected_id);
-		meta_forward($_SERVER['PHP_SELF']); 
+		display_notification(_('Selected movement type has been deleted'));
 	}
+	$Mode = 'RESET';
 }
 
+if ($Mode == 'RESET')
+{
+	$selected_id = -1;
+	$sav = get_post('show_inactive');
+	unset($_POST);
+	$_POST['show_inactive'] = $sav;
+}
 //-----------------------------------------------------------------------------------
 
-$result = get_all_movement_type();
+$result = get_all_movement_type(check_value('show_inactive'));
 
-start_table("$table_style width=30%");
+start_form();
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Description"), "", "");
+inactive_control_column($th);
 table_header($th);
 $k = 0;
 while ($myrow = db_fetch($result)) 
@@ -97,29 +102,27 @@ 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");
+	inactive_control_cell($myrow["id"], $myrow["inactive"], 'movement_types', 'id');
+ 	edit_button_cell("Edit".$myrow['id'], _("Edit"));
+ 	delete_button_cell("Delete".$myrow['id'], _("Delete"));
 	end_row();
 }
-
-end_table();
+inactive_control_row($th);
+end_table(1);
 
 //-----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Inventory Movement Type"));
-
-start_form();
-
-start_table();
+start_table(TABLESTYLE2);
 
-if (isset($selected_id)) 
+if ($selected_id != -1) 
 {
-	//editing an existing status code
+ 	if ($Mode == 'Edit') {
+		//editing an existing status code
 
-	$myrow = get_movement_type($selected_id);
-
-	$_POST['name']  = $myrow["name"];
+		$myrow = get_movement_type($selected_id);
 
+		$_POST['name']  = $myrow["name"];
+	}
 	hidden('selected_id', $selected_id);
 } 
 
@@ -127,7 +130,7 @@ text_row(_("Description:"), 'name', null, 50, 50);
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();