X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=e4db890c757934b51754bca59e21bcb6bbc9ef7e;hb=9f2ede887db250a31f9c64c24e2813d81dce0af2;hp=de0261b710216f4887febae785d2a57d31728f36;hpb=16d64d92f645e62d95f487494f9cc8926f63cefd;p=fa-stable.git
diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index de0261b7..e4db890c 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -22,30 +22,38 @@ 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')=='';
+$new_item = get_post('stock_id')=='' || get_post('cancel');
//------------------------------------------------------------------------------------
if (isset($_GET['stock_id']))
{
- $_POST['stock_id'] = $stock_id = strtoupper($_GET['stock_id']);
+ $_POST['stock_id'] = $stock_id = $_GET['stock_id'];
}
-else if (isset($_POST['stock_id']))
+elseif (isset($_POST['stock_id']))
{
- $stock_id = strtoupper($_POST['stock_id']);
+ $stock_id = $_POST['stock_id'];
}
-
if (list_updated('stock_id')) {
$_POST['NewStockID'] = get_post('stock_id');
clear_data();
$Ajax->activate('details');
$Ajax->activate('controls');
}
+
+if (get_post('cancel')) {
+ $_POST['NewStockID'] = $_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');
}
$upload_file = "";
if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
{
+ $stock_id = $_POST['NewStockID'];
$result = $_FILES['pic']['error'];
$upload_file = 'Yes'; //Assume all is well to start off with
$filename = $comp_path . "/$user_comp/images";
@@ -53,7 +61,7 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
{
mkdir($filename);
}
- $filename .= "/$stock_id.jpg";
+ $filename .= "/".item_img_name($stock_id).".jpg";
//But check for the worst
if (strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)) != 'JPG')
@@ -85,6 +93,7 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
{
$result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
}
+ $Ajax->activate('details');
/* EOF Add Image upload for New Item - by Ori */
}
@@ -144,16 +153,29 @@ if (isset($_POST['addupdate']))
if ($input_error != 1)
{
-
+ if (check_value('del_image'))
+ {
+ $filename = $comp_path . "/$user_comp/images/".item_img_name($_POST['NewStockID']).".jpg";
+ if (file_exists($filename))
+ unlink($filename);
+ }
+
if (!$new_item)
{ /*so its an existing one */
-
update_item($_POST['NewStockID'], $_POST['description'],
- $_POST['long_description'], $_POST['category_id'], $_POST['tax_type_id'],
- $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'],
+ $_POST['long_description'], $_POST['category_id'],
+ $_POST['tax_type_id'], get_post('units'),
+ get_post('mb_flag'), $_POST['sales_account'],
+ $_POST['inventory_account'], $_POST['cogs_account'],
$_POST['adjustment_account'], $_POST['assembly_account'],
- $_POST['dimension_id'], $_POST['dimension2_id']);
-
+ $_POST['dimension_id'], $_POST['dimension2_id'],
+ check_value('no_sale'));
+ update_record_status($_POST['NewStockID'], $_POST['inactive'],
+ 'stock_master', 'stock_id');
+ update_record_status($_POST['NewStockID'], $_POST['inactive'],
+ 'item_codes', 'item_code');
+ set_focus('stock_id');
+ $Ajax->activate('stock_id'); // in case of status change
display_notification(_("Item has been updated."));
}
else
@@ -164,69 +186,68 @@ if (isset($_POST['addupdate']))
$_POST['units'], $_POST['mb_flag'], $_POST['sales_account'],
$_POST['inventory_account'], $_POST['cogs_account'],
$_POST['adjustment_account'], $_POST['assembly_account'],
- $_POST['dimension_id'], $_POST['dimension2_id']);
+ $_POST['dimension_id'], $_POST['dimension2_id'],
+ check_value('no_sale'));
- display_notification(_("A new item has been added."));
- $_POST['stock_id'] = $_POST['NewStockID'] = '';
+ display_notification(_("A new item has been added."));
+ $_POST['stock_id'] = $_POST['NewStockID'] =
+ $_POST['description'] = $_POST['long_description'] = '';
+ set_focus('NewStockID');
}
- set_focus('stock_id');
$Ajax->activate('_page_body');
}
}
//------------------------------------------------------------------------------------
-function can_delete($stock_id)
-{
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves WHERE stock_id='$stock_id'";
- $result = db_query($sql, "could not query stock moves");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
+function check_usage($stock_id, $dispmsg=true)
{
- display_error(_('Cannot delete this item because there are stock movements that refer to this item.'));
- return false;
+ $sqls= array(
+ "SELECT COUNT(*) FROM "
+ .TB_PREF."stock_moves WHERE stock_id='$stock_id'" =>
+ _('Cannot delete this item because there are stock movements that refer to this item.'),
+ "SELECT COUNT(*) FROM "
+ .TB_PREF."bom WHERE component='$stock_id'"=>
+ _('Cannot delete this item record because there are bills of material that require this part as a component.'),
+ "SELECT COUNT(*) FROM "
+ .TB_PREF."sales_order_details WHERE stk_code='$stock_id'" =>
+ _('Cannot delete this item because there are existing purchase order items for it.'),
+ "SELECT COUNT(*) FROM "
+ .TB_PREF."purch_order_details WHERE item_code='$stock_id'"=>
+ _('Cannot delete this item because there are existing purchase order items for it.')
+ );
+
+ $msg = '';
+
+ foreach($sqls as $sql=>$err) {
+ $result = db_query($sql, "could not query stock usage");
+ $myrow = db_fetch_row($result);
+ if ($myrow[0] > 0)
+ {
+ $msg = $err; break;
+ }
}
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."bom WHERE component='$stock_id'";
- $result = db_query($sql, "could not query boms");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
- {
- display_error(_('Cannot delete this item record because there are bills of material that require this part as a component.'));
- return false;
- }
+ if ($msg == '') {
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_order_details WHERE stk_code='$stock_id'";
- $result = db_query($sql, "could not query sales orders");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
- {
- display_error(_('Cannot delete this item record because there are existing sales orders for this part.'));
- 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 .= ',';
+ }
- $sql= "SELECT COUNT(*) FROM ".TB_PREF."purch_order_details WHERE item_code='$stock_id'";
- $result = db_query($sql, "could not query purchase orders");
- $myrow = db_fetch_row($result);
- if ($myrow[0] > 0)
- {
- 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);
+ }
+ if ($msg != '') {
+ if($dispmsg) display_error($msg);
return false;
}
return true;
@@ -237,11 +258,11 @@ function can_delete($stock_id)
if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
{
- if (can_delete($_POST['NewStockID'])) {
+ if (check_usage($_POST['NewStockID'])) {
$stock_id = $_POST['NewStockID'];
delete_item($stock_id);
- $filename = $comp_path . "/$user_comp/images/$stock_id.jpg";
+ $filename = $comp_path . "/$user_comp/images/".item_img_name($stock_id).".jpg";
if (file_exists($filename))
unlink($filename);
display_notification(_("Selected item has been deleted."));
@@ -269,10 +290,16 @@ if (db_has_stock_items())
start_table("class='tablestyle_noborder'");
start_row();
stock_items_list_cells(_("Select an item:"), 'stock_id', null,
- _('New item'), true);
+ _('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();
+
+ if (get_post('_show_inactive_update')) {
+ $Ajax->activate('stock_id');
+ set_focus('stock_id');
+ }
}
div_start('details');
@@ -287,6 +314,7 @@ table_section_title(_("Item"));
if ($new_item)
{
text_row(_("Item Code:"), 'NewStockID', null, 21, 20);
+ $_POST['inactive'] = 0;
}
else
{ // Must be modifying an existing item
@@ -308,7 +336,9 @@ else
$_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"];
label_row(_("Item Code:"),$_POST['NewStockID']);
hidden('NewStockID', $_POST['NewStockID']);
set_focus('description');
@@ -334,15 +364,16 @@ if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) {
$_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"];
}
+$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);
-stock_item_types_list_row(_("Item Type:"), 'mb_flag', null,
- (!isset($_POST['NewStockID']) || $new_item));
+stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item);
-stock_units_list_row(_('Units of Measure:'), 'units', null,
- (!isset($_POST['NewStockID']) || $new_item));
+stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item);
$dim = get_company_pref('use_dimension');
if ($dim >= 1)
@@ -383,18 +414,21 @@ if (is_manufactured($_POST['mb_flag']))
else
hidden('assembly_account', $_POST['assembly_account']);
-table_section_title(_("Picture"));
+table_section_title(_("Other"));
// 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"))
+$check_remove_image = false;
+if (isset($_POST['NewStockID']) && file_exists("$comp_path/$user_comp/images/"
+ .item_img_name($_POST['NewStockID']).".jpg"))
{
// 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D.
$stock_img_link .= "
";
+ "]' src='$comp_path/$user_comp/images/".item_img_name($_POST['NewStockID']).".jpg?nocache=".rand()."'".
+ " height='$pic_height' border='0'>";
+ $check_remove_image = true;
}
else
{
@@ -402,7 +436,12 @@ else
}
label_row(" ", $stock_img_link);
+if ($check_remove_image)
+ check_row(_("Delete Image:"), 'del_image', $_POST['del_image']);
+
+check_row(_("Exclude from sales:"), 'no_sale', $_POST['no_sale']);
+record_status_list_row(_("Item status:"), 'inactive');
end_outer_table(1);
div_end();
div_start('controls');
@@ -412,9 +451,11 @@ if (!isset($_POST['NewStockID']) || $new_item)
}
else
{
- submit_center_first('addupdate', _("Update Item"), '', 'default');
+ submit_center_first('addupdate', _("Update Item"), '',
+ count($_SESSION['Context']) ? true : 'default');
submit_return('select', _("Return"), _("Select this items and return to document entry."), 'default');
- submit_center_last('delete', _("Delete This Item"), '', true);
+ submit('delete', _("Delete This Item"), true, '', true);
+ submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel');
}
div_end();