From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 1 Nov 2011 09:07:33 +0000 (+0100)
Subject: Cleanup Items.php. Bugfix in extra tabs.
X-Git-Tag: 2.3-final~539
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;ds=inline;h=314cf82b95dde0646e8e76c80f422e088bf0c61b;p=fa-stable.git

Cleanup Items.php. Bugfix in extra tabs.
---

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 4599dfdf..5fdc7026 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -32,20 +32,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 +205,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 +245,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 +397,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,13 +442,16 @@ 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),
-		'status' => array(_('&Status'), $stock_id),
+		'movement' => array(_('Inventory Item &Movement'), $stock_id),
+		'status' => array(_('Inventory Item &Status'), $stock_id),
 	));
 	
 	switch (get_post('_tabs_sel')) {
@@ -473,6 +475,8 @@ tabbed_content_start('tabs', array(
 br();
 tabbed_content_end();
 
+div_end();
+
 
 hidden('popup', @$_REQUEST['popup']);
 end_form();