X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fadjustments.php;h=5a9f95d6c2dc54005b637a31f7095efaa66b9cd4;hb=30c04f9f87e74bd4201f56ce25f02d4c5d01f99b;hp=dda848d7da92f306fab1d9c4683255e9e0cdcb59;hpb=f10bbcae2fab1a9346bb0f51d71fdd304d691935;p=fa-stable.git diff --git a/inventory/adjustments.php b/inventory/adjustments.php index dda848d7..5a9f95d6 100644 --- a/inventory/adjustments.php +++ b/inventory/adjustments.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root=".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); @@ -32,11 +41,11 @@ if (isset($_GET['AddedID'])) $trans_type = systypes::inventory_adjustment(); display_notification_centered(_("Items adjustment has been processed")); - display_note(get_trans_view_str($trans_type, $trans_no, _("View this adjustment"))); + display_note(get_trans_view_str($trans_type, $trans_no, _("&View this adjustment"))); - display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Adjustment")), 1, 0); + display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL &Postings for this Adjustment")), 1, 0); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Adjustment")); + hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Adjustment")); display_footer_exit(); } @@ -48,27 +57,6 @@ function line_start_focus() { $Ajax->activate('items_table'); set_focus('_stock_id_edit'); } -//-------------------------------------------------------------------------------------------------- - -function copy_to_st() -{ - $_SESSION['adj_items']->from_loc = $_POST['StockLocation']; - $_SESSION['adj_items']->tran_date = $_POST['AdjDate']; - $_SESSION['adj_items']->transfer_type = $_POST['type']; - $_SESSION['adj_items']->increase = $_POST['Increase']; - $_SESSION['adj_items']->memo_ = $_POST['memo_']; -} -//-------------------------------------------------------------------------------------------------- - -function copy_from_st() -{ - $_POST['StockLocation'] = $_SESSION['adj_items']->from_loc; - $_POST['AdjDate'] = $_SESSION['adj_items']->tran_date; - $_POST['type'] = $_SESSION['adj_items']->transfer_type; - $_POST['Increase'] = $_SESSION['adj_items']->increase; - $_POST['memo_'] = $_SESSION['adj_items']->memo_; -} - //----------------------------------------------------------------------------------------------- function handle_new_order() @@ -82,7 +70,7 @@ function handle_new_order() session_register("adj_items"); $_SESSION['adj_items'] = new items_cart(systypes::inventory_adjustment()); - $_POST['AdjDate'] = Today(); + $_POST['AdjDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['AdjDate'])) $_POST['AdjDate'] = end_fiscalyear(); $_SESSION['adj_items']->tran_date = $_POST['AdjDate']; @@ -146,7 +134,7 @@ if (isset($_POST['Process']) && can_process()){ $trans_no = add_stock_adjustment($_SESSION['adj_items']->line_items, $_POST['StockLocation'], $_POST['AdjDate'], $_POST['type'], $_POST['Increase'], $_POST['ref'], $_POST['memo_']); - + new_doc_date($_POST['AdjDate']); $_SESSION['adj_items']->clear_items(); unset($_SESSION['adj_items']); @@ -212,11 +200,6 @@ $id = find_submit('Delete'); if ($id != -1) handle_delete_item($id); -if (isset($_POST['AddItem']) || isset($_POST['UpdateItem'])) { - copy_to_st(); - line_start_focus(); -} - if (isset($_POST['AddItem'])) handle_new_item(); @@ -234,21 +217,19 @@ if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items'])) } //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_order_header($_SESSION['adj_items']); -start_table("$table_style width=70%", 10); -start_row(); -echo "