Merging changes form main trunk 2.2.5-2.2.6

[fa-stable.git] / inventory / manage / items.php

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 872dc5b9e2ed2fe605c6e38156c75db712fef92c..250b657857ae54b97976b4f17c1fa186db9daf34 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -276,6 +276,7 @@ if ($new_item)
 } 
 else 
 { // Must be modifying an existing item
+       if (!isset($_POST['NewStockID'])) {
                $_POST['NewStockID'] = $_POST['stock_id'];
 
                $myrow = get_item($_POST['NewStockID']);
@@ -298,9 +299,10 @@ else
                $_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, 50);
@@ -382,7 +384,7 @@ else
 table_section_title(_("Other"));
 
 // Add image upload for New Item  - by Joe
-label_row(_("Image File (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
+file_row(_("Image File (.jpg)") . ":", 'pic', 'pic');
 // Add Image upload for New Item  - by Joe
 $stock_img_link = "";
 $check_remove_image = false;