X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fcost_update.php;h=0b22ac18b0f80d70727b2d0bec8f5d29016e71d8;hb=0917891be384286611592f13872cc9437826ce09;hp=845ec8494ddeaf8d77cd0aa67683376d55f12aa3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/inventory/cost_update.php b/inventory/cost_update.php index 845ec849..0b22ac18 100644 --- a/inventory/cost_update.php +++ b/inventory/cost_update.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); @@ -26,22 +35,24 @@ if (isset($_GET['stock_id'])) } //-------------------------------------------------------------------------------------- - if (isset($_POST['UpdateData'])) { - $old_cost = $_POST['OldMaterialCost'] + $_POST['OldLabourCost'] + $_POST['OldLabourCost']; - $new_cost = $_POST['material_cost'] + $_POST['labour_cost'] + $_POST['overhead_cost']; + $old_cost = $_POST['OldMaterialCost'] + $_POST['OldLabourCost'] + + $_POST['OldOverheadCost']; + $new_cost = input_num('material_cost') + input_num('labour_cost') + + input_num('overhead_cost'); $should_update = true; - if (!is_numeric($_POST['material_cost']) || !is_numeric($_POST['labour_cost']) || - !is_numeric($_POST['overhead_cost'])) + if (!check_num('material_cost') || !check_num('labour_cost') || + !check_num('overhead_cost')) { display_error( _("The entered cost is not numeric.")); + set_focus('material_cost'); $should_update = false; - } - elseif ($old_cost == $new_cost) + } + elseif ($old_cost == $new_cost) { display_error( _("The new cost is the same as the old cost. Cost was not updated.")); $should_update = false; @@ -49,21 +60,24 @@ if (isset($_POST['UpdateData'])) if ($should_update) { - $update_no = stock_cost_update($_POST['stock_id'], $_POST['material_cost'], - $_POST['labour_cost'], $_POST['overhead_cost'], $old_cost); + $update_no = stock_cost_update($_POST['stock_id'], + input_num('material_cost'), input_num('labour_cost'), + input_num('overhead_cost'), $old_cost); - display_note(_("Cost has been updated.")); + display_notification(_("Cost has been updated.")); if ($update_no > 0) { - display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 1, 0); + display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 0, 1); } } } +if (list_updated('stock_id')) + $Ajax->activate('cost_table'); //----------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); @@ -74,42 +88,45 @@ stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); echo "