X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=54df94bf68969db2202871c05bdb4734385f68a9;hb=7561718ee5113232ce917f63085d272884b0929c;hp=70572f59fed52f10d7245ca162d4941a38af1864;hpb=0c760ea65c8c6f0a45ea8328abab53be649f2105;p=fa-stable.git diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 70572f59..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" ) @@ -126,6 +125,7 @@ function clear_data() unset($_POST['dimension_id']); unset($_POST['dimension2_id']); unset($_POST['no_sale']); + unset($_POST['no_purchase']); } //------------------------------------------------------------------------------------ @@ -182,7 +182,7 @@ if (isset($_POST['addupdate'])) $_POST['inventory_account'], $_POST['cogs_account'], $_POST['adjustment_account'], $_POST['assembly_account'], $_POST['dimension_id'], $_POST['dimension2_id'], - check_value('no_sale'), check_value('editable')); + check_value('no_sale'), check_value('editable'), check_value('no_purchase')); update_record_status($_POST['NewStockID'], $_POST['inactive'], 'stock_master', 'stock_id'); update_record_status($_POST['NewStockID'], $_POST['inactive'], @@ -200,12 +200,12 @@ if (isset($_POST['addupdate'])) $_POST['inventory_account'], $_POST['cogs_account'], $_POST['adjustment_account'], $_POST['assembly_account'], $_POST['dimension_id'], $_POST['dimension2_id'], - check_value('no_sale'), check_value('editable')); + check_value('no_sale'), check_value('editable'), check_value('no_purchase')); display_notification(_("A new item has been added.")); $_POST['stock_id'] = $_POST['NewStockID'] = $_POST['description'] = $_POST['long_description'] = ''; - $_POST['no_sale'] = $_POST['editable'] = 0; + $_POST['no_sale'] = $_POST['editable'] = $_POST['no_purchase'] =0; set_focus('NewStockID'); } $Ajax->activate('_page_body'); @@ -254,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); @@ -294,7 +294,8 @@ function item_settings(&$stock_id) $_POST['dimension_id'] = $myrow['dimension_id']; $_POST['dimension2_id'] = $myrow['dimension2_id']; $_POST['no_sale'] = $myrow['no_sale']; - $_POST['del_image'] = 0; + $_POST['no_purchase'] = $myrow['no_purchase']; + $_POST['del_image'] = 0; $_POST['inactive'] = $myrow["inactive"]; $_POST['editable'] = $myrow["editable"]; } @@ -324,6 +325,7 @@ function item_settings(&$stock_id) $_POST['dimension_id'] = $category_record["dflt_dim1"]; $_POST['dimension2_id'] = $category_record["dflt_dim2"]; $_POST['no_sale'] = $category_record["dflt_no_sale"]; + $_POST['no_purchase'] = $category_record["dflt_no_purchase"]; $_POST['editable'] = 0; } @@ -340,6 +342,8 @@ function item_settings(&$stock_id) check_row(_("Exclude from sales:"), 'no_sale'); + check_row(_("Exclude from purchases:"), 'no_purchase'); + table_section(2); $dim = get_company_pref('use_dimension'); @@ -392,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 .= "[".$_POST["; + ".jpg?nocache=".rand()."'"." height='".$SysPrefs->pic_height."' border='0'>"; $check_remove_image = true; } else @@ -459,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), )); @@ -466,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; @@ -490,4 +522,3 @@ end_form(); //------------------------------------------------------------------------------------ end_page(@$_REQUEST['popup']); -?>