X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=08a2d9a6ac2df239a36d899549341dabfe4790e5;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=9a91acc229e6d199234248f65260c4f185d83cd5;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 9a91acc2..08a2d9a6 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -16,11 +16,10 @@ include($path_to_root . "/includes/session.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
-	
-page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js);
 
+page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -76,8 +75,8 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
 	{	//File type Check
 		display_warning( _('Only graphics files can be uploaded'));
 		$upload_file ='No';
-	}	
-	elseif (@strtoupper(substr(trim($_FILES['pic']['name']), @in_array(strlen($_FILES['pic']['name']) - 3)), array('JPG','PNG','GIF')))
+	}
+	elseif (!in_array(strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)), array('JPG','PNG','GIF')))
 	{
 		display_warning(_('Only graphics files are supported - a file extension of .jpg, .png or .gif is expected'));
 		$upload_file ='No';
@@ -464,6 +463,10 @@ if (!$stock_id)
 
 tabbed_content_start('tabs', array(
 		'settings' => array(_('&General settings'), $stock_id),
+		'sales_pricing' => array(_('S&ales Pricing'), $stock_id),
+		'purchase_pricing' => array(_('&Purchasing Pricing'), $stock_id),
+		'standard_cost' => array(_('Standard &Costs'), $stock_id),
+		'reorder_level' => array(_('&Reorder Levels'), (is_inventory_item($stock_id) ? $stock_id : null)),
 		'movement' => array(_('&Transactions'), $stock_id),
 		'status' => array(_('&Status'), $stock_id),
 	));
@@ -473,6 +476,30 @@ tabbed_content_start('tabs', array(
 		case 'settings':
 			item_settings($stock_id); 
 			break;
+		case 'sales_pricing':
+			$_GET['stock_id'] = $stock_id;
+			$_GET['popup'] = 1;
+			include_once($path_to_root."/inventory/prices.php");
+			break;
+		case 'purchase_pricing':
+			$_GET['stock_id'] = $stock_id;
+			$_GET['popup'] = 1;
+			include_once($path_to_root."/inventory/purchasing_data.php");
+			break;
+		case 'standard_cost':
+			$_GET['stock_id'] = $stock_id;
+			$_GET['popup'] = 1;
+			include_once($path_to_root."/inventory/cost_update.php");
+			break;
+		case 'reorder_level':
+			if (!is_inventory_item($stock_id))
+			{
+				break;
+			}	
+			$_GET['stock_id'] = $stock_id;
+			$_GET['popup'] = 1;
+			include_once($path_to_root."/inventory/reorder_level.php");
+			break;
 		case 'movement':
 			$_GET['stock_id'] = $stock_id;
 			$_GET['popup'] = 1;
@@ -495,4 +522,3 @@ end_form();
 //------------------------------------------------------------------------------------
 
 end_page(@$_REQUEST['popup']);
-?>