X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=fdc55902f1a2dbcae94508d65e8d1acc62177e7d;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=99091defdf6dcf9ee32be7255be0a889c10422fc;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 99091def..fdc55902 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");
@@ -46,17 +55,17 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
//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))
@@ -123,7 +132,13 @@ if (isset($_POST['addupdate']))
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)
{
@@ -195,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;
}
@@ -241,7 +271,9 @@ if (db_has_stock_items())
}
div_start('details');
-start_table("$table_style2 width=40%");
+start_outer_table($table_style2, 5);
+
+table_section(1);
table_section_title(_("Item"));
@@ -300,29 +332,7 @@ else
text_row(_("Name:"), 'description', null, 52, 50);
-textarea_row(_('Description:'), 'long_description', null, 45, 3);
-
-end_table();
-start_table("$table_style2 width=40%");
-// Add image upload for New Item - by Joe
-start_row();
-label_cells(_("Image File (.jpg)") . ":", "");
-// Add Image upload for New Item - by Joe
-$stock_img_link = "= 1)
+{
+ table_section_title(_("Dimensions"));
+
+ dimensions_list_row(_("Dimension")." 1", 'dimension_id', null, true, " ", false, 1);
+ if ($dim > 1)
+ dimensions_list_row(_("Dimension")." 2", 'dimension2_id', null, true, " ", false, 2);
+}
+if ($dim < 1)
+ hidden('dimension_id', 0);
+if ($dim < 2)
+ hidden('dimension2_id', 0);
+
+table_section(2);
table_section_title(_("GL Accounts"));
@@ -358,21 +382,28 @@ if (is_manufactured($_POST['mb_flag']))
gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']);
else
hidden('assembly_account', $_POST['assembly_account']);
-$dim = get_company_pref('use_dimension');
-if ($dim >= 1)
-{
- table_section_title(_("Dimensions"));
- dimensions_list_row(_("Dimension")." 1", 'dimension_id', null, true, " ", false, 1);
- if ($dim > 1)
- dimensions_list_row(_("Dimension")." 2", 'dimension2_id', null, true, " ", false, 2);
+table_section_title(_("Picture"));
+
+// Add image upload for New Item - by Joe
+label_row(_("Image File (.jpg)") . ":", "");
+// Add Image upload for New Item - by Joe
+$stock_img_link = "";
+if (isset($_POST['NewStockID']) && file_exists("$comp_path/$user_comp/images/".$_POST['NewStockID'].".jpg"))
+{
+ // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D.
+ $stock_img_link .= "";
+}
+else
+{
+ $stock_img_link .= _("No image");
}
-if ($dim < 1)
- hidden('dimension_id', 0);
-if ($dim < 2)
- hidden('dimension2_id', 0);
-end_table(1);
+label_row(" ", $stock_img_link);
+
+end_outer_table(1);
div_end();
div_start('controls');
if (!isset($_POST['NewStockID']) || $new_item)