X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Ftransfers.php;h=b311558928907704ad7dee50c156f11149b90b27;hb=1a851e527fe366364c6d2baaf2684222f9394b48;hp=a17253d50bb1e7b95bfac6b47c97687c133b9533;hpb=f10bbcae2fab1a9346bb0f51d71fdd304d691935;p=fa-stable.git diff --git a/inventory/transfers.php b/inventory/transfers.php index a17253d5..b3115589 100644 --- a/inventory/transfers.php +++ b/inventory/transfers.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root=".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); @@ -32,9 +41,9 @@ if (isset($_GET['AddedID'])) $trans_type = systypes::location_transfer(); display_notification_centered(_("Inventory transfer has been processed")); - display_note(get_trans_view_str($trans_type, $trans_no, _("View this transfer"))); + display_note(get_trans_view_str($trans_type, $trans_no, _("&View this transfer"))); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Inventory Transfer")); + hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Inventory Transfer")); display_footer_exit(); } @@ -46,27 +55,6 @@ function line_start_focus() { $Ajax->activate('items_table'); set_focus('_stock_id_edit'); } -//-------------------------------------------------------------------------------------------------- - -function copy_to_st() -{ - $_SESSION['transfer_items']->from_loc = $_POST['FromStockLocation']; - $_SESSION['transfer_items']->to_loc = $_POST['ToStockLocation']; - $_SESSION['transfer_items']->tran_date = $_POST['AdjDate']; - $_SESSION['transfer_items']->transfer_type = $_POST['type']; - $_SESSION['transfer_items']->memo_ = $_POST['memo_']; -} -//-------------------------------------------------------------------------------------------------- - -function copy_from_st() -{ - $_POST['FromStockLocation'] = $_SESSION['transfer_items']->from_loc; - $_POST['ToStockLocation'] = $_SESSION['transfer_items']->to_loc; - $_POST['AdjDate'] = $_SESSION['transfer_items']->tran_date; - $_POST['type'] = $_SESSION['transfer_items']->transfer_type; - $_POST['memo_'] = $_SESSION['transfer_items']->memo_; -} - //----------------------------------------------------------------------------------------------- function handle_new_order() @@ -80,7 +68,7 @@ function handle_new_order() session_register("transfer_items"); $_SESSION['transfer_items'] = new items_cart(systypes::location_transfer()); - $_POST['AdjDate'] = Today(); + $_POST['AdjDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['AdjDate'])) $_POST['AdjDate'] = end_fiscalyear(); $_SESSION['transfer_items']->tran_date = $_POST['AdjDate']; @@ -155,7 +143,7 @@ if (isset($_POST['Process'])) $trans_no = add_stock_transfer($_SESSION['transfer_items']->line_items, $_POST['FromStockLocation'], $_POST['ToStockLocation'], $_POST['AdjDate'], $_POST['type'], $_POST['ref'], $_POST['memo_']); - + new_doc_date($_POST['AdjDate']); $_SESSION['transfer_items']->clear_items(); unset($_SESSION['transfer_items']); @@ -213,11 +201,6 @@ function handle_new_item() $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(); @@ -236,7 +219,7 @@ if (isset($_GET['NewTransfer']) || !isset($_SESSION['transfer_items'])) } //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_order_header($_SESSION['transfer_items']); @@ -250,7 +233,7 @@ end_row(); end_table(1); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', _("Process Transfer"), '', true); +submit_center_last('Process', _("Process Transfer"), '', 'default'); end_form(); end_page();