X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fmanage%2Fitems.php;h=901bfc1a01c6a411159527898908086fcad5b5fa;hb=fe1f5b5e9c57ff544939158bab7334cc77ce2169;hp=78ca9f2b34378a79175738a18409c486a07dbe12;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 78ca9f2b..901bfc1a 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 11;
$path_to_root="../..";
include($path_to_root . "/includes/session.inc");
@@ -13,58 +22,54 @@ include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
$user_comp = user_company();
+$new_item = get_post('stock_id')=='';
//------------------------------------------------------------------------------------
if (isset($_GET['stock_id']))
{
- $stock_id = strtoupper($_GET['stock_id']);
+ $_POST['stock_id'] = $stock_id = strtoupper($_GET['stock_id']);
}
else if (isset($_POST['stock_id']))
{
$stock_id = strtoupper($_POST['stock_id']);
}
-if (isset($_GET['New']) || !isset($_POST['NewStockID']))
-{
- $_POST['New'] = "1";
-}
-
-if (isset($_POST['SelectStockItem']))
-{
- $_POST['NewStockID'] = $_POST['stock_id'];
- unset($_POST['New']);
+if (list_updated('stock_id')) {
+ $_POST['NewStockID'] = get_post('stock_id');
+ clear_data();
+ $Ajax->activate('details');
+ $Ajax->activate('controls');
}
$upload_file = "";
if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
{
$result = $_FILES['pic']['error'];
$upload_file = 'Yes'; //Assume all is well to start off with
- $filename = $path_to_root . "/inventory/manage/image/$user_comp/";
+ $filename = $comp_path . "/$user_comp/images";
if (!file_exists($filename))
{
mkdir($filename);
}
- $filename .= "$stock_id.jpg";
+ $filename .= "/$stock_id.jpg";
//But check for the worst
if (strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)) != 'JPG')
{
- display_notification(_('Only jpg files are supported - a file extension of .jpg is expected'));
+ display_warning(_('Only jpg files are supported - a file extension of .jpg is expected'));
$upload_file ='No';
}
elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024))
{ //File Size Check
- display_notification(_('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') . ' ' . $max_image_size);
$upload_file ='No';
}
elseif ( $_FILES['pic']['type'] == "text/plain" )
{ //File type Check
- display_notification( _('Only graphics files can be uploaded'));
+ display_warning( _('Only graphics files can be uploaded'));
$upload_file ='No';
}
elseif (file_exists($filename))
{
- display_notification(_('Attempting to overwrite an existing item image'));
$result = unlink($filename);
if (!$result)
{
@@ -76,7 +81,6 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
if ($upload_file == 'Yes')
{
$result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
- $message = ($result)?_('File url') ."$filename" : "Somthing is wrong with uploading a file.";
}
/* EOF Add Image upload for New Item - by Ori */
}
@@ -97,7 +101,6 @@ function clear_data()
unset($_POST['NewStockID']);
unset($_POST['dimension_id']);
unset($_POST['dimension2_id']);
- $_POST['New'] = "1";
}
//------------------------------------------------------------------------------------
@@ -112,11 +115,13 @@ if (isset($_POST['addupdate']))
{
$input_error = 1;
display_error( _('The item name must be entered.'));
+ set_focus('description');
}
elseif (strlen($_POST['NewStockID']) == 0)
{
$input_error = 1;
display_error( _('The item code cannot be empty'));
+ set_focus('NewStockID');
}
elseif (strstr($_POST['NewStockID'], " ") || strstr($_POST['NewStockID'],"'") ||
strstr($_POST['NewStockID'], "+") || strstr($_POST['NewStockID'], "\"") ||
@@ -124,13 +129,20 @@ if (isset($_POST['addupdate']))
{
$input_error = 1;
display_error( _('The item code cannot contain any of the following characters - & + OR a space OR quotes'));
+ set_focus('NewStockID');
}
-
+ elseif ($new_item && db_num_rows(get_item_kit($_POST['NewStockID'])))
+ {
+ $input_error = 1;
+ display_error( _("This item code is already assigned to stock item or sale kit."));
+ set_focus('NewStockID');
+ }
+
if ($input_error != 1)
{
- if (!isset($_POST['New']))
+ if (!$new_item)
{ /*so its an existing one */
update_item($_POST['NewStockID'], $_POST['description'],
@@ -139,6 +151,7 @@ if (isset($_POST['addupdate']))
$_POST['adjustment_account'], $_POST['assembly_account'],
$_POST['dimension_id'], $_POST['dimension2_id']);
+ display_notification(_("Item has been updated."));
}
else
{ //it is a NEW part
@@ -149,8 +162,12 @@ if (isset($_POST['addupdate']))
$_POST['inventory_account'], $_POST['cogs_account'],
$_POST['adjustment_account'], $_POST['assembly_account'],
$_POST['dimension_id'], $_POST['dimension2_id']);
+
+ display_notification(_("A new item has been added."));
+ $_POST['stock_id'] = $_POST['NewStockID'];
}
- meta_forward($_SERVER['PHP_SELF']);
+ set_focus('stock_id');
+ $Ajax->activate('_page_body');
}
}
@@ -193,7 +210,22 @@ function can_delete($stock_id)
display_error(_('Cannot delete this item because there are existing purchase order items for it.'));
return false;
}
-
+ $kits = get_where_used($stock_id);
+ $num_kits = db_num_rows($kits);
+ if ($num_kits) {
+ $msg = _("This item cannot be deleted because some code aliases
+ or foreign codes was entered for it, or there are kits defined
+ using this item as component")
+ .':
';
+
+ while($num_kits--) {
+ $kit = db_fetch($kits);
+ $msg .= "'".$kit[0]."'";
+ if ($num_kits) $msg .= ',';
+ }
+ display_error($msg);
+ return false;
+ }
return true;
}
@@ -206,12 +238,22 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
$stock_id = $_POST['NewStockID'];
delete_item($stock_id);
- $filename = $path_to_root . "/inventory/manage/image/$user_comp/$stock_id.jpg";
+ $filename = $comp_path . "/$user_comp/images/$stock_id.jpg";
if (file_exists($filename))
unlink($filename);
- meta_forward($_SERVER['PHP_SELF']);
+ display_notification(_("Selected item has been deleted."));
+ $_POST['stock_id'] = '';
+ clear_data();
+ set_focus('stock_id');
+ $Ajax->activate('_page_body');
}
}
+//--------------------------------------------------------------------------------------------
+
+if (isset($_POST['select']))
+{
+ context_return(array('stock_id' => $_POST['stock_id']));
+}
//------------------------------------------------------------------------------------
@@ -221,28 +263,25 @@ if (db_has_stock_items())
{
start_table("class='tablestyle_noborder'");
start_row();
- stock_items_list_cells(_("Select an item:"), 'stock_id', null);
- submit_cells('SelectStockItem', _("Edit Item"));
+ stock_items_list_cells(_("Select an item:"), 'stock_id', null,
+ _('New item'), true);
+ $new_item = get_post('stock_id')=='';
end_row();
end_table();
}
-hyperlink_params($_SERVER['PHP_SELF'], _("Enter a new item"), "New=1");
-echo "
";
-
+div_start('details');
start_table("$table_style2 width=40%");
table_section_title(_("Item"));
//------------------------------------------------------------------------------------
-if (!isset($_POST['NewStockID']) || isset($_POST['New']))
+if ($new_item)
{
/*If the page was called without $_POST['NewStockID'] passed to page then assume a new item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden stock_id field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/
- hidden('New', 'Yes');
-
text_row(_("Item Code:"), 'NewStockID', null, 21, 20);
$company_record = get_company_prefs();
@@ -265,9 +304,8 @@ if (!isset($_POST['NewStockID']) || isset($_POST['New']))
}
else
{ // Must be modifying an existing item
+ $_POST['NewStockID'] = $_POST['stock_id'];
- if (!isset($_POST['New']))
- {
$myrow = get_item($_POST['NewStockID']);
$_POST['long_description'] = $myrow["long_description"];
@@ -287,12 +325,12 @@ else
label_row(_("Item Code:"),$_POST['NewStockID']);
hidden('NewStockID', $_POST['NewStockID']);
- }
+ set_focus('description');
}
text_row(_("Name:"), 'description', null, 52, 50);
-textarea_row(_('Description:'), 'long_description', null, 50, 3);
+textarea_row(_('Description:'), 'long_description', null, 45, 3);
end_table();
start_table("$table_style2 width=40%");
@@ -300,14 +338,18 @@ start_table("$table_style2 width=40%");
start_row();
label_cells(_("Image File (.jpg)") . ":", "");
// Add Image upload for New Item - by Joe
-if (isset($_POST['NewStockID']) && file_exists("$path_to_root/inventory/manage/image/$user_comp/".$_POST['NewStockID'].".jpg"))
+$stock_img_link = "
";
+ // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D.
+ $stock_img_link .= $_POST['NewStockID'].".jpg".
+ "]' src='$comp_path/$user_comp/images/".$_POST['NewStockID'].".jpg?nocache=".rand()."'";
}
else
{
- $stock_img_link = "No Image";
+ $stock_img_link .= _("No image"). "]'";
}
+$stock_img_link .= " width='$pic_width' height='$pic_height' border='0'>";
label_cell($stock_img_link, "valign=top align=center rowspan=5");
end_row();
@@ -317,13 +359,10 @@ stock_categories_list_row(_("Category:"), 'category_id', null);
item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null);
stock_item_types_list_row(_("Item Type:"), 'mb_flag', null,
- (!isset($_POST['NewStockID']) || isset($_POST['New'])));
-
-/* The array stock_units is set up in config.php for user modification
-possible units of measure can added or modifying the array definition by editing that file */
+ (!isset($_POST['NewStockID']) || $new_item));
stock_units_list_row(_('Units of Measure:'), 'units', null,
- (!isset($_POST['NewStockID']) || isset($_POST['New'])));
+ (!isset($_POST['NewStockID']) || $new_item));
end_table();
start_table("$table_style2 width=40%");
@@ -364,20 +403,20 @@ if ($dim < 2)
hidden('dimension2_id', 0);
end_table(1);
-
-if (!isset($_POST['NewStockID']) || (isset($_POST['New']) && $_POST['New'] != ""))
+div_end();
+div_start('controls');
+if (!isset($_POST['NewStockID']) || $new_item)
{
- submit_center('addupdate', _("Insert New Item"));
-
+ submit_center('addupdate', _("Insert New Item"), true, '', true);
}
else
{
- submit_center_first('addupdate', _("Update Item"));
-
- submit_center_last('delete', _("Delete This Item"));
+ submit_center_first('addupdate', _("Update Item"), '', true);
+ submit_return('select', _("Return"), _("Select this items and return to document entry."), true);
+ submit_center_last('delete', _("Delete This Item"), '', true);
}
-
+div_end();
end_form();
//------------------------------------------------------------------------------------