X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fadjustments.php;h=5a9f95d6c2dc54005b637a31f7095efaa66b9cd4;hb=30c04f9f87e74bd4201f56ce25f02d4c5d01f99b;hp=e2a793843208bc676b69404e26d11852cb8cc952;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git diff --git a/inventory/adjustments.php b/inventory/adjustments.php index e2a79384..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,37 +41,22 @@ 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(); } - //-------------------------------------------------------------------------------------------------- -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 line_start_focus() { + global $Ajax; -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_; + $Ajax->activate('items_table'); + set_focus('_stock_id_edit'); } - //----------------------------------------------------------------------------------------------- function handle_new_order() @@ -75,8 +69,8 @@ function handle_new_order() session_register("adj_items"); - $_SESSION['adj_items'] = new items_cart; - $_POST['AdjDate'] = Today(); + $_SESSION['adj_items'] = new items_cart(systypes::inventory_adjustment()); + $_POST['AdjDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['AdjDate'])) $_POST['AdjDate'] = end_fiscalyear(); $_SESSION['adj_items']->tran_date = $_POST['AdjDate']; @@ -86,36 +80,50 @@ function handle_new_order() function can_process() { + $adj = &$_SESSION['adj_items']; + + if (count($adj->line_items) == 0) { + display_error(_("You must enter at least one non empty item line.")); + set_focus('stock_id'); + return false; + } if (!references::is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); + set_focus('ref'); return false; } if (!is_new_reference($_POST['ref'], systypes::inventory_adjustment())) { display_error( _("The entered reference is already in use.")); + set_focus('ref'); return false; } if (!is_date($_POST['AdjDate'])) { display_error(_("The entered date for the adjustment is invalid.")); + set_focus('AdjDate'); return false; } elseif (!is_date_in_fiscalyear($_POST['AdjDate'])) { display_error(_("The entered date is not in fiscal year.")); + set_focus('AdjDate'); return false; - } - $failed_item = $_SESSION['adj_items']->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']); - if ($failed_item != null) - { - display_error(_("The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :") . - " " . $failed_item->stock_id . " - " . $failed_item->item_description); + } else { + $failed_item = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']); + if ($failed_item >= 0) + { + $line = $adj->line_items[$failed_item]; + display_error(_("The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :") . + " " . $line->stock_id . " - " . $line->item_description); + $_POST['Edit'.$failed_item] = 1; // enter edit mode + unset($_POST['Process']); return false; + } } - return true; } @@ -126,9 +134,10 @@ 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']); + meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); } /*end of process credit note */ @@ -136,21 +145,17 @@ if (isset($_POST['Process']) && can_process()){ function check_item_data() { - if (!is_numeric($_POST['qty'])) + if (!check_num('qty',0)) { - display_error(_("The quantity entered is not a valid number.")); + display_error(_("The quantity entered is negative or invalid.")); + set_focus('qty'); return false; } - if ($_POST['qty'] <= 0) - { - display_error(_("The quantity entered must be greater than zero.")); - return false; - } - - if (!is_numeric($_POST['std_cost']) || $_POST['std_cost'] < 0) + if (!check_num('std_cost', 0)) { display_error(_("The entered standard cost is negative or invalid.")); + set_focus('std_cost'); return false; } @@ -163,15 +168,19 @@ function handle_update_item() { if($_POST['UpdateItem'] != "" && check_item_data()) { - $_SESSION['adj_items']->update_cart_item($_POST['stock_id'], $_POST['qty'], $_POST['std_cost']); + $id = $_POST['LineNo']; + $_SESSION['adj_items']->update_cart_item($id, input_num('qty'), + input_num('std_cost')); } + line_start_focus(); } //----------------------------------------------------------------------------------------------- -function handle_delete_item() +function handle_delete_item($id) { - $_SESSION['adj_items']->remove_from_cart($_GET['Delete']); + $_SESSION['adj_items']->remove_from_cart($id); + line_start_focus(); } //----------------------------------------------------------------------------------------------- @@ -181,26 +190,25 @@ function handle_new_item() if (!check_item_data()) return; - add_to_order($_SESSION['adj_items'], $_POST['stock_id'], $_POST['qty'], $_POST['std_cost']); + add_to_order($_SESSION['adj_items'], $_POST['stock_id'], + input_num('qty'), input_num('std_cost')); + line_start_focus(); } //----------------------------------------------------------------------------------------------- +$id = find_submit('Delete'); +if ($id != -1) + handle_delete_item($id); -if (isset($_GET['Delete']) || isset($_GET['Edit'])) - copy_from_st(); - -if (isset($_GET['Delete'])) - handle_delete_item(); - -if (isset($_POST['AddItem']) || isset($_POST['UpdateItem'])) - copy_to_st(); - if (isset($_POST['AddItem'])) handle_new_item(); if (isset($_POST['UpdateItem'])) handle_update_item(); +if (isset($_POST['CancelItemChanges'])) { + line_start_focus(); +} //----------------------------------------------------------------------------------------------- if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items'])) @@ -209,29 +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 "