X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=dbd25cd3caa60022865a28ad5991c64d7cf9307e;hb=9c6c7f431d1316b65bb996186acedcc3e8c3b582;hp=901bfc1a01c6a411159527898908086fcad5b5fa;hpb=82b8239e7d990b4b2a34618eb3f9ed9c9fd6c2c6;p=fa-stable.git diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 901bfc1a..dbd25cd3 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ $page_security = 11; $path_to_root="../.."; @@ -22,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'])) @@ -40,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'] != '') { @@ -164,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'); @@ -179,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; } @@ -245,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'); } } @@ -255,6 +267,7 @@ if (isset($_POST['select'])) context_return(array('stock_id' => $_POST['stock_id'])); } + //------------------------------------------------------------------------------------ start_form(true); @@ -271,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")); @@ -279,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 @@ -330,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)") . ":", ""); -// Add Image upload for New Item - by Joe -$stock_img_link = "["; -if (isset($_POST[= 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")); @@ -388,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)") . ":", ""); +// 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 .= "[".$_POST["; +} +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) { - 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();