X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fmanage%2Fitems.php;h=666486f08b94ddd1295210e20c122d80e8547feb;hb=18ce16fd14342f897111c66b40295af4d351ef58;hp=4599dfdfdd3c667735d74e0d1a06aa5f9d41d4a2;hpb=575fa4304beb3cd570a0352d52ee6c6aeb3864f7;p=fa-stable.git

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 4599dfdf..666486f0 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -15,6 +15,8 @@ include($path_to_root . "/includes/session.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
 	
 page(_($help_context = "Items"), false, false, "", $js);
 
@@ -32,20 +34,20 @@ if (isset($_GET['stock_id']))
 {
 	$_POST['stock_id'] = $_GET['stock_id'];
 }
+$stock_id = get_post('stock_id');
 if (list_updated('stock_id')) {
-	$_POST['NewStockID'] = get_post('stock_id');
+	$_POST['NewStockID'] = $stock_id = get_post('stock_id');
     clear_data();
 	$Ajax->activate('details');
 	$Ajax->activate('controls');
 }
 
 if (get_post('cancel')) {
-	$_POST['NewStockID'] = $_POST['stock_id'] = '';
+	$_POST['NewStockID'] = $stock_id = $_POST['stock_id'] = '';
     clear_data();
 	set_focus('stock_id');
 	$Ajax->activate('_page_body');
 }
-$stock_id = get_post('stock_id');
 if (list_updated('category_id') || list_updated('mb_flag')) {
 	$Ajax->activate('details');
 }
@@ -205,6 +207,7 @@ if (isset($_POST['addupdate']))
 
 if (get_post('clone')) {
 	unset($_POST['stock_id']);
+	$stock_id = '';
 	unset($_POST['inactive']);
 	set_focus('NewStockID');
 	$Ajax->activate('_page_body');
@@ -244,12 +247,10 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 	}
 }
 
-function item_settings($stock_id) 
+function item_settings(&$stock_id) 
 {
 	global $SysPrefs, $path_to_root, $new_item, $pic_height;
 
-	div_start('details');
-
 	start_outer_table(TABLESTYLE2);
 
 	table_section(1);
@@ -398,7 +399,7 @@ function item_settings($stock_id)
 
 	record_status_list_row(_("Item status:"), 'inactive');
 	end_outer_table(1);
-	div_end();
+
 	div_start('controls');
 	if (!isset($_POST['NewStockID']) || $new_item) 
 	{
@@ -443,12 +444,15 @@ else
 	hidden('stock_id', get_post('stock_id'));
 }
 
-if ($stock_id != "")
+div_start('details');
+
+$stock_id = get_post('stock_id');
+if (!$stock_id)
 	unset($_POST['_tabs_sel']); // force settings tab for new customer
 
 tabbed_content_start('tabs', array(
 		'settings' => array(_('&General settings'), $stock_id),
-		'movement' => array(_('&Movement'), $stock_id),
+		'movement' => array(_('&Transactions'), $stock_id),
 		'status' => array(_('&Status'), $stock_id),
 	));
 	
@@ -460,24 +464,24 @@ tabbed_content_start('tabs', array(
 		case 'movement':
 			$_GET['stock_id'] = $stock_id;
 			$_GET['popup'] = 1;
-			$_SERVER['REQUEST_METHOD'] = 'GET';			
 			include_once($path_to_root."/inventory/inquiry/stock_movements.php");
 			break;
 		case 'status':
 			$_GET['stock_id'] = $stock_id;
 			$_GET['popup'] = 1;
-			$_SERVER['REQUEST_METHOD'] = 'GET';			
 			include_once($path_to_root."/inventory/inquiry/stock_status.php");
 			break;
 	};
 br();
 tabbed_content_end();
 
+div_end();
+
 
 hidden('popup', @$_REQUEST['popup']);
 end_form();
 
 //------------------------------------------------------------------------------------
 
-end_page();
+end_page(@$_REQUEST['popup']);
 ?>