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

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 9a91acc2..54df94bf 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -14,13 +14,12 @@ $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->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,15 +75,15 @@ 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';
 	} 
-	elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024)) 
+	elseif ( $_FILES['pic']['size'] > ($SysPrefs->max_image_size * 1024)) 
 	{ //File Size Check
-		display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $max_image_size);
+		display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $SysPrefs->max_image_size);
 		$upload_file ='No';
 	} 
 	elseif ( $_FILES['pic']['type'] == "text/plain" ) 
@@ -255,9 +254,9 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 	}
 }
 
-function item_settings(&$stock_id) 
+function item_settings(&$stock_id, $new_item) 
 {
-	global $SysPrefs, $path_to_root, $new_item, $pic_height;
+	global $SysPrefs, $path_to_root;
 
 	start_outer_table(TABLESTYLE2);
 
@@ -397,7 +396,7 @@ function item_settings(&$stock_id)
 	 // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D.
 		$stock_img_link .= "<img id='item_img' alt = '[".$_POST['NewStockID'].".jpg".
 			"]' src='".company_path().'/images/'.item_img_name($_POST['NewStockID']).
-			".jpg?nocache=".rand()."'"." height='$pic_height' border='0'>";
+			".jpg?nocache=".rand()."'"." height='".$SysPrefs->pic_height."' border='0'>";
 		$check_remove_image = true;
 	} 
 	else 
@@ -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),
 	));
@@ -471,7 +474,31 @@ tabbed_content_start('tabs', array(
 	switch (get_post('_tabs_sel')) {
 		default:
 		case 'settings':
-			item_settings($stock_id); 
+			item_settings($stock_id, $new_item); 
+			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;
@@ -495,4 +522,3 @@ end_form();
 //------------------------------------------------------------------------------------
 
 end_page(@$_REQUEST['popup']);
-?>