X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Ftransfers.php;h=26859e59a19c2b0939ddb698efeec2e98709ee5a;hb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;hp=b76557a0fb6aa9e27ccdbdb45eb7d8b220e2f97f;hpb=5cae8206ae7eaf4df4b95b7f2184e2332f85ec8d;p=fa-stable.git diff --git a/inventory/transfers.php b/inventory/transfers.php index b76557a0..26859e59 100644 --- a/inventory/transfers.php +++ b/inventory/transfers.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_LOCATIONTRANSFER'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -16,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Inventory Location Transfers"), false, false, "", $js); +page(_($help_context = "Inventory Location Transfers"), false, false, "", $js); //----------------------------------------------------------------------------------------------- @@ -29,12 +38,12 @@ check_db_has_movement_types(_("There are no inventory movement types defined in if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::location_transfer(); + $trans_type = ST_LOCTRANSFER; 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() @@ -77,10 +65,10 @@ function handle_new_order() unset ($_SESSION['transfer_items']); } - session_register("transfer_items"); + //session_register("transfer_items"); - $_SESSION['transfer_items'] = new items_cart; - $_POST['AdjDate'] = Today(); + $_SESSION['transfer_items'] = new items_cart(ST_LOCTRANSFER); + $_POST['AdjDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['AdjDate'])) $_POST['AdjDate'] = end_fiscalyear(); $_SESSION['transfer_items']->tran_date = $_POST['AdjDate']; @@ -90,6 +78,7 @@ function handle_new_order() if (isset($_POST['Process'])) { + global $Refs; $tr = &$_SESSION['transfer_items']; $input_error = 0; @@ -99,13 +88,13 @@ if (isset($_POST['Process'])) set_focus('stock_id'); return false; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); $input_error = 1; } - elseif (!is_new_reference($_POST['ref'], systypes::location_transfer())) + elseif (!is_new_reference($_POST['ref'], ST_LOCTRANSFER)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -155,7 +144,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,14 +202,6 @@ function handle_new_item() $id = find_submit('Delete'); if ($id != -1) handle_delete_item($id); - -//if (isset($_GET['Delete']) || isset($_GET['Edit'])) -// copy_from_st(); - -if (isset($_POST['AddItem']) || isset($_POST['UpdateItem'])) { - copy_to_st(); - line_start_focus(); -} if (isset($_POST['AddItem'])) handle_new_item(); @@ -239,11 +220,11 @@ if (isset($_GET['NewTransfer']) || !isset($_SESSION['transfer_items'])) } //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_order_header($_SESSION['transfer_items']); -start_table("$table_style width=70%", 10); +start_table(TABLESTYLE, "width=70%", 10); start_row(); echo ""; display_transfer_items(_("Items"), $_SESSION['transfer_items']); @@ -252,8 +233,8 @@ echo ""; end_row(); end_table(1); -submit_center_first('Update', _("Update"), '', true); -submit_center_last('Process', _("Process Transfer"), '', true); +submit_center_first('Update', _("Update"), '', null); +submit_center_last('Process', _("Process Transfer"), '', 'default'); end_form(); end_page();