X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=ceb556fecaade6fc1164486ce43087df71502a51;hb=ab6e80ccdc767b78bbb4a4a38190f16a77747feb;hp=666486f08b94ddd1295210e20c122d80e8547feb;hpb=d79955724a5808af20c6b256d1ba4c1b41e818ef;p=fa-stable.git

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 666486f0..ceb556fe 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -18,7 +18,7 @@ if ($use_popup_windows)
 if ($use_date_picker)
 	$js .= get_js_date_picker();
 	
-page(_($help_context = "Items"), false, 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");
@@ -74,8 +74,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';
@@ -452,8 +452,19 @@ if (!$stock_id)
 
 tabbed_content_start('tabs', array(
 		'settings' => array(_('&General settings'), $stock_id),
-		'movement' => array(_('&Transactions'), $stock_id),
+		'sales_pricing' => array(_('S&ales Pricing'), 
+			($_SESSION["wa_current_user"]->can_access_page('SA_SALESPRICE') ? $stock_id : null)),
+		'purchase_pricing' => array(_('&Purchasing Pricing'), 
+			($_SESSION["wa_current_user"]->can_access_page('SA_PURCHASEPRICING') ? $stock_id : null)),
+		'standard_cost' => array(_('Standard &Costs'), 
+			($_SESSION["wa_current_user"]->can_access_page('SA_STANDARDCOST') ? $stock_id : null)),
+		'reorder_level' => array(_('&Reorder Levels'), (is_inventory_item($stock_id) && 
+			$_SESSION["wa_current_user"]->can_access_page('SA_REORDER') ? $stock_id : null)),
+		'movement' => array(_('&Transactions'), 
+			($_SESSION["wa_current_user"]->can_access_page('SA_ITEMSTRANSVIEW') ? $stock_id : null)),
 		'status' => array(_('&Status'), $stock_id),
+		//'status' => array(_('&Status'), 
+		//	($_SESSION["wa_current_user"]->can_access_page('SA_ITEMSSTATVIEW') ? $stock_id : null)),
 	));
 	
 	switch (get_post('_tabs_sel')) {
@@ -461,6 +472,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;