X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=54df94bf68969db2202871c05bdb4734385f68a9;hb=7561718ee5113232ce917f63085d272884b0929c;hp=c07c198b063bc2b508b1a0ec5e8368911111f55b;hpb=3046080be916a8a398466cd41ec594d289c4a65a;p=fa-stable.git diff --git a/inventory/manage/items.php b/inventory/manage/items.php index c07c198b..54df94bf 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -12,10 +12,13 @@ $page_security = 'SA_ITEM'; $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 (user_use_date_picker()) + $js .= get_js_date_picker(); + page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); @@ -30,26 +33,22 @@ $new_item = get_post('stock_id')=='' || get_post('cancel') || get_post('clone'); if (isset($_GET['stock_id'])) { - $_POST['stock_id'] = $stock_id = $_GET['stock_id']; -} -elseif (isset($_POST['stock_id'])) -{ - $stock_id = $_POST['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'); } - if (list_updated('category_id') || list_updated('mb_flag')) { $Ajax->activate('details'); } @@ -76,17 +75,22 @@ 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" ) + { //File type Check + display_warning( _('Only graphics files can be uploaded')); + $upload_file ='No'; + } elseif (file_exists($filename)) { $result = unlink($filename); @@ -121,6 +125,7 @@ function clear_data() unset($_POST['dimension_id']); unset($_POST['dimension2_id']); unset($_POST['no_sale']); + unset($_POST['no_purchase']); } //------------------------------------------------------------------------------------ @@ -177,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'], @@ -195,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'); @@ -209,6 +214,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'); @@ -247,215 +253,272 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1) $Ajax->activate('_page_body'); } } -//-------------------------------------------------------------------------------------------- - -start_form(true); -if (db_has_stock_items()) +function item_settings(&$stock_id, $new_item) { - start_table(TABLESTYLE_NOBORDER); - start_row(); - stock_items_list_cells(_("Select an item:"), 'stock_id', null, - _('New item'), true, check_value('show_inactive')); - $new_item = get_post('stock_id')==''; - check_cells(_("Show inactive:"), 'show_inactive', null, true); - end_row(); - end_table(); + global $SysPrefs, $path_to_root; - if (get_post('_show_inactive_update')) { - $Ajax->activate('stock_id'); - set_focus('stock_id'); - } -} + start_outer_table(TABLESTYLE2); -div_start('details'); -start_outer_table(TABLESTYLE2); + table_section(1); -table_section(1); + table_section_title(_("Item")); -table_section_title(_("Item")); + //------------------------------------------------------------------------------------ + if ($new_item) + { + text_row(_("Item Code:"), 'NewStockID', null, 21, 20); -//------------------------------------------------------------------------------------ -if ($new_item) -{ - text_row(_("Item Code:"), 'NewStockID', null, 21, 20); - - $_POST['inactive'] = 0; -} -else -{ // Must be modifying an existing item - if (get_post('NewStockID') != get_post('stock_id') || get_post('addupdate')) { // first item display - - $_POST['NewStockID'] = $_POST['stock_id']; - - $myrow = get_item($_POST['NewStockID']); - - $_POST['long_description'] = $myrow["long_description"]; - $_POST['description'] = $myrow["description"]; - $_POST['category_id'] = $myrow["category_id"]; - $_POST['tax_type_id'] = $myrow["tax_type_id"]; - $_POST['units'] = $myrow["units"]; - $_POST['mb_flag'] = $myrow["mb_flag"]; - - $_POST['sales_account'] = $myrow['sales_account']; - $_POST['inventory_account'] = $myrow['inventory_account']; - $_POST['cogs_account'] = $myrow['cogs_account']; - $_POST['adjustment_account'] = $myrow['adjustment_account']; - $_POST['assembly_account'] = $myrow['assembly_account']; - $_POST['dimension_id'] = $myrow['dimension_id']; - $_POST['dimension2_id'] = $myrow['dimension2_id']; - $_POST['no_sale'] = $myrow['no_sale']; - $_POST['del_image'] = 0; - $_POST['inactive'] = $myrow["inactive"]; - $_POST['editable'] = $myrow["editable"]; + $_POST['inactive'] = 0; + } + else + { // Must be modifying an existing item + if (get_post('NewStockID') != get_post('stock_id') || get_post('addupdate')) { // first item display + + $_POST['NewStockID'] = $_POST['stock_id']; + + $myrow = get_item($_POST['NewStockID']); + + $_POST['long_description'] = $myrow["long_description"]; + $_POST['description'] = $myrow["description"]; + $_POST['category_id'] = $myrow["category_id"]; + $_POST['tax_type_id'] = $myrow["tax_type_id"]; + $_POST['units'] = $myrow["units"]; + $_POST['mb_flag'] = $myrow["mb_flag"]; + + $_POST['sales_account'] = $myrow['sales_account']; + $_POST['inventory_account'] = $myrow['inventory_account']; + $_POST['cogs_account'] = $myrow['cogs_account']; + $_POST['adjustment_account'] = $myrow['adjustment_account']; + $_POST['assembly_account'] = $myrow['assembly_account']; + $_POST['dimension_id'] = $myrow['dimension_id']; + $_POST['dimension2_id'] = $myrow['dimension2_id']; + $_POST['no_sale'] = $myrow['no_sale']; + $_POST['no_purchase'] = $myrow['no_purchase']; + $_POST['del_image'] = 0; + $_POST['inactive'] = $myrow["inactive"]; + $_POST['editable'] = $myrow["editable"]; + } + label_row(_("Item Code:"),$_POST['NewStockID']); + hidden('NewStockID', $_POST['NewStockID']); + set_focus('description'); } - label_row(_("Item Code:"),$_POST['NewStockID']); - hidden('NewStockID', $_POST['NewStockID']); - set_focus('description'); -} -text_row(_("Name:"), 'description', null, 52, 200); + text_row(_("Name:"), 'description', null, 52, 200); -textarea_row(_('Description:'), 'long_description', null, 42, 3); + textarea_row(_('Description:'), 'long_description', null, 42, 3); -stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item); + stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item); -if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) { + if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) { - $category_record = get_item_category($_POST['category_id']); + $category_record = get_item_category($_POST['category_id']); - $_POST['tax_type_id'] = $category_record["dflt_tax_type"]; - $_POST['units'] = $category_record["dflt_units"]; - $_POST['mb_flag'] = $category_record["dflt_mb_flag"]; - $_POST['inventory_account'] = $category_record["dflt_inventory_act"]; - $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; - $_POST['sales_account'] = $category_record["dflt_sales_act"]; - $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; - $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; - $_POST['dimension_id'] = $category_record["dflt_dim1"]; - $_POST['dimension2_id'] = $category_record["dflt_dim2"]; - $_POST['no_sale'] = $category_record["dflt_no_sale"]; - $_POST['editable'] = 0; + $_POST['tax_type_id'] = $category_record["dflt_tax_type"]; + $_POST['units'] = $category_record["dflt_units"]; + $_POST['mb_flag'] = $category_record["dflt_mb_flag"]; + $_POST['inventory_account'] = $category_record["dflt_inventory_act"]; + $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; + $_POST['sales_account'] = $category_record["dflt_sales_act"]; + $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; + $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; + $_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; -} -$fresh_item = !isset($_POST['NewStockID']) || $new_item - || check_usage($_POST['stock_id'],false); + } + $fresh_item = !isset($_POST['NewStockID']) || $new_item + || check_usage($_POST['stock_id'],false); -item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); + item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); -stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); + stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); -stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); + stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); -check_row(_("Editable description:"), 'editable'); + check_row(_("Editable description:"), 'editable'); -check_row(_("Exclude from sales:"), 'no_sale'); + check_row(_("Exclude from sales:"), 'no_sale'); -if (!$new_item) -{ - if (!@$_REQUEST['popup']) + check_row(_("Exclude from purchases:"), 'no_purchase'); + + table_section(2); + + $dim = get_company_pref('use_dimension'); + if ($dim >= 1) { - start_row(); - echo '