X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=dbd25cd3caa60022865a28ad5991c64d7cf9307e;hb=bf5873e7f5925d0f616743fce771873a4b7cecdf;hp=99091defdf6dcf9ee32be7255be0a889c10422fc;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 99091def..dbd25cd3 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 11;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -13,7 +22,7 @@ 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']))
@@ -31,6 +40,17 @@ if (list_updated('stock_id')) {
 	$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'] != '') 
 {
@@ -46,17 +66,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 +143,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)
 	{
 
@@ -149,7 +175,7 @@ if (isset($_POST['addupdate']))
 				$_POST['dimension_id'], $_POST['dimension2_id']);
 
 		display_notification(_("A new item has been added."));
-		$_POST['stock_id'] = $_POST['NewStockID'];
+		$_POST['stock_id'] = $_POST['NewStockID'] = '';
 		}
 		set_focus('stock_id');
 		$Ajax->activate('_page_body');
@@ -164,7 +190,7 @@ function can_delete($stock_id)
 	$result = db_query($sql, "could not query stock moves");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
-	{
+{
 		display_error(_('Cannot delete this item because there are stock movements that refer to this item.'));
 		return false;
 	}
@@ -195,7 +221,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")
+			.':<br>';
+
+		while($num_kits--) {
+			$kit = db_fetch($kits);
+			$msg .= "'".$kit[0]."'";
+			if ($num_kits) $msg .= ',';
+		}
+		display_error($msg);
+		return false;
+	}
 	return true;
 }
 
@@ -215,6 +256,7 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 		$_POST['stock_id'] = '';
 		clear_data();
 		set_focus('stock_id');
+		$new_item = true;
 		$Ajax->activate('_page_body');
 	}
 }
@@ -225,6 +267,7 @@ if (isset($_POST['select']))
 	context_return(array('stock_id' => $_POST['stock_id']));
 }
 
+
 //------------------------------------------------------------------------------------
 
 start_form(true);
@@ -241,7 +284,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"));
 
@@ -249,28 +294,7 @@ table_section_title(_("Item"));
 
 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*/
-
 	text_row(_("Item Code:"), 'NewStockID', null, 21, 20);
-
-	$company_record = get_company_prefs();
-
-    if (!isset($_POST['inventory_account']) || $_POST['inventory_account'] == "")
-    	$_POST['inventory_account'] = $company_record["default_inventory_act"];
-
-    if (!isset($_POST['cogs_account']) || $_POST['cogs_account'] == "")
-    	$_POST['cogs_account'] = $company_record["default_cogs_act"];
-
-	if (!isset($_POST['sales_account']) || $_POST['sales_account'] == "")
-		$_POST['sales_account'] = $company_record["default_inv_sales_act"];
-
-	if (!isset($_POST['adjustment_account']) || $_POST['adjustment_account'] == "")
-		$_POST['adjustment_account'] = $company_record["default_adj_act"];
-
-	if (!isset($_POST['assembly_account']) || $_POST['assembly_account'] == "")
-		$_POST['assembly_account'] = $company_record["default_assembly_act"];
-
 } 
 else 
 { // Must be modifying an existing item
@@ -300,31 +324,25 @@ else
 
 text_row(_("Name:"), 'description', null, 52, 50);
 
-textarea_row(_('Description:'), 'long_description', null, 45, 3);
+textarea_row(_('Description:'), 'long_description', null, 42, 3);
 
-end_table();
-start_table("$table_style2 width=40%");
-// Add image upload for New Item  - by Joe
-start_row();
-label_cells(_("Image File (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
-// Add Image upload for New Item  - by Joe
-$stock_img_link = "<img id='item_img' alt = '[";
-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 .= $_POST['NewStockID'].".jpg".
-	"]' src='$comp_path/$user_comp/images/".$_POST['NewStockID'].".jpg?nocache=".rand()."'";
-} 
-else 
-{
-	$stock_img_link .= _("No image"). "]'";
-}
-$stock_img_link .= " width='$pic_width' height='$pic_height' border='0'>";
+stock_categories_list_row(_("Category:"), 'category_id', null, $new_item);
 
-label_cell($stock_img_link, "valign=top align=center rowspan=5");
-end_row();
+if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) {
 
-stock_categories_list_row(_("Category:"), 'category_id', null);
+	$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"];
+}
 
 item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null);
 
@@ -333,8 +351,22 @@ stock_item_types_list_row(_("Item Type:"), 'mb_flag', null,
 
 stock_units_list_row(_('Units of Measure:'), 'units', null,
 	(!isset($_POST['NewStockID']) || $new_item));
-end_table();
-start_table("$table_style2 width=40%");
+
+$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);
+}
+if ($dim < 1)
+	hidden('dimension_id', 0);
+if ($dim < 2)
+	hidden('dimension2_id', 0);
+
+table_section(2);
 
 table_section_title(_("GL Accounts"));
 
@@ -358,32 +390,41 @@ 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)") . ":", "<input type='file' id='pic' name='pic'>");
+// 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 .= "<img id='item_img' alt = '[".$_POST['NewStockID'].".jpg".
+		"]' src='$comp_path/$user_comp/images/".$_POST['NewStockID'].".jpg?nocache=".rand()."'".
+		" width='$pic_width' height='$pic_height' border='0'>";
+} 
+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("&nbsp;", $stock_img_link);
+
+end_outer_table(1);
 div_end();
 div_start('controls');
 if (!isset($_POST['NewStockID']) || $new_item) 
 {
-	submit_center('addupdate', _("Insert New Item"), true, '', true);
+	submit_center('addupdate', _("Insert New Item"), true, '', 'default');
 } 
 else 
 {
-	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);
+	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('delete', _("Delete This Item"), true, '', true);
+	submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel');
 }
 
 div_end();