X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fcost_update.php;h=f4fa70ba0f0fec5cf7b2ecb1b4372a794edd346e;hb=270487d423a5848a21c1666c44bfba354bf18576;hp=11ab6fc39c7ed9c8121c9d577ad243ab0a985b20;hpb=95fd152649f9383cee8680762daf3430e8250bd6;p=fa-stable.git diff --git a/inventory/cost_update.php b/inventory/cost_update.php index 11ab6fc3..f4fa70ba 100644 --- a/inventory/cost_update.php +++ b/inventory/cost_update.php @@ -27,11 +27,21 @@ include_once($path_to_root . "/includes/ui/items_cart.inc"); $js = ""; if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); -page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js); + +if (isset($_GET['FixedAsset'])) { + $_SESSION['page_title'] = _($help_context = "FA Revaluation"); + $_POST['fixed_asset'] = 1; +} else { + $_SESSION['page_title'] = _($help_context = "Inventory Item Cost Update"); +} +page($_SESSION['page_title'], false, false, "", $js); //-------------------------------------------------------------------------------------- -check_db_has_costable_items(_("There are no costable inventory items defined in the system (Purchased or manufactured items).")); +if (get_post('fixed_asset') == 1) + check_db_has_disposable_fixed_assets(_("There are no fixed assets defined in the system.")); +else + check_db_has_costable_items(_("There are no costable inventory items defined in the system (Purchased or manufactured items).")); if (isset($_GET['stock_id'])) { @@ -39,10 +49,10 @@ if (isset($_GET['stock_id'])) } //-------------------------------------------------------------------------------------- +$should_update = false; if (isset($_POST['UpdateData'])) { - - $old_cost = get_standard_cost($_POST['stock_id']); + $old_cost = get_unit_cost($_POST['stock_id']); $new_cost = input_num('material_cost') + input_num('labour_cost') + input_num('overhead_cost'); @@ -66,7 +76,8 @@ if (isset($_POST['UpdateData'])) { $update_no = stock_cost_update($_POST['stock_id'], input_num('material_cost'), input_num('labour_cost'), - input_num('overhead_cost'), $old_cost); + input_num('overhead_cost'), $old_cost, + $_POST['refline'], $_POST['memo_']); display_notification(_("Cost has been updated.")); @@ -78,8 +89,10 @@ if (isset($_POST['UpdateData'])) } } -if (list_updated('stock_id')) +if (list_updated('stock_id') || $should_update) { + unset($_POST['memo_']); $Ajax->activate('cost_table'); +} //----------------------------------------------------------------------------------------- $action = $_SERVER['PHP_SELF']; @@ -87,13 +100,18 @@ if ($page_nested) $action .= "?stock_id=".get_post('stock_id'); start_form(false, false, $action); +hidden('fixed_asset'); + if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); if (!$page_nested) { echo "