Fixed unmatched column count when inserting item.

[fa-stable.git] / inventory / cost_update.php

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index ced20387db19f6a48fd5ef5791bb48766ee0d7f9..8abab67198a3ccec976d9ea4c0a1c4d8a8e73f77 100644 (file)
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -23,13 +23,10 @@ include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
-if (!@$_GET['popup'])
-{
-       $js = "";
-       if ($use_popup_windows)
-               $js .= get_js_open_window(900, 500);
-       page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js);
-}
+$js = "";
+if ($use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------------
 
@@ -45,7 +42,7 @@ if (isset($_POST['UpdateData']))
 {
 
        $old_cost = get_standard_cost($_POST['stock_id']);
-     
+
        $new_cost = input_num('material_cost') + input_num('labour_cost')
             + input_num('overhead_cost');
 
@@ -85,14 +82,14 @@ if (list_updated('stock_id'))
 //-----------------------------------------------------------------------------------------
 
 $action = $_SERVER['PHP_SELF'];
-if (@$_GET['popup'])
+if ($page_nested)
        $action .= "?stock_id=".get_post('stock_id');
 start_form(false, false, $action);
 
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
 
-if (!@$_GET['popup'])
+if (!$page_nested)
 {
        echo "<center>" . _("Item:"). "&nbsp;";
        //echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
@@ -117,8 +114,10 @@ $_POST['overhead_cost'] = price_decimal_format($myrow["overhead_cost"], $dec3);
 
 amount_row(_("Standard Material Cost Per Unit"), "material_cost", null, "class='tableheader2'", null, $dec1);
 
-if (@$_GET['popup'])
-       hidden('_tabs_sel', get_post('_tabs_sel'));
+if ($page_nested)
+{
+       hidden('popup', @$_GET['popup']);
+}
 if ($myrow["mb_flag"]=='M')
 {
        amount_row(_("Standard Labour Cost Per Unit"), "labour_cost", null, "class='tableheader2'", null, $dec2);
@@ -135,7 +134,4 @@ div_end();
 submit_center('UpdateData', _("Update"), true, false, 'default');
 
 end_form();
-if (!@$_GET['popup'])
-       end_page(@$_GET['popup'], false, false);
-
-?>
+end_page();