X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=inventory%2Fcost_update.php;h=0e39a0c050c33f6fe5799b5e79f9bf40b46ed728;hb=90b3d069d96b99671af51726e2953352738abb75;hp=e268f360dbdcdca8d6200bf88d087a57ab98b36d;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git
diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index e268f360..0e39a0c0 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
-page(_("Inventory Item Cost Update"), false, false, "", $js);
+page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js);
//--------------------------------------------------------------------------------------
@@ -38,8 +38,8 @@ if (isset($_GET['stock_id']))
if (isset($_POST['UpdateData']))
{
- $old_cost = $_POST['OldMaterialCost'] + $_POST['OldLabourCost']
- + $_POST['OldOverheadCost'];
+ $old_cost = get_standard_cost($_POST['stock_id']);
+
$new_cost = input_num('material_cost') + input_num('labour_cost')
+ input_num('overhead_cost');
@@ -83,40 +83,27 @@ if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
echo "
" . _("Item:"). " ";
-stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
+//echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
+echo stock_items_list('stock_id', $_POST['stock_id'], false, true);
echo "
";
set_global_stock_item($_POST['stock_id']);
-$sql = "SELECT description, units, material_cost, labour_cost,
- overhead_cost, mb_flag
- FROM ".TB_PREF."stock_master
- WHERE stock_id=".db_escape($_POST['stock_id']) . "
- GROUP BY description, units, material_cost, labour_cost, overhead_cost, mb_flag";
-$result = db_query($sql);
-check_db_error("The cost details for the item could not be retrieved", $sql);
+$myrow = get_item($_POST['stock_id']);
-$myrow = db_fetch($result);
div_start('cost_table');
-hidden("OldMaterialCost", $myrow["material_cost"]);
-hidden("OldLabourCost", $myrow["labour_cost"]);
-hidden("OldOverheadCost", $myrow["overhead_cost"]);
-
-start_table($table_style2);
-
-$_POST['material_cost'] = price_format($myrow["material_cost"]);
-$_POST['labour_cost'] = price_format($myrow["labour_cost"]);
-$_POST['overhead_cost'] = price_format($myrow["overhead_cost"]);
-amount_row(_("Standard Material Cost Per Unit"), "material_cost",
- null, "class='tableheader2'");
+start_table(TABLESTYLE2);
+$dec1 = $dec2 = $dec3 = 0;
+$_POST['material_cost'] = price_decimal_format($myrow["material_cost"], $dec1);
+$_POST['labour_cost'] = price_decimal_format($myrow["labour_cost"], $dec2);
+$_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 ($myrow["mb_flag"]=='M')
{
- amount_row(_("Standard Labour Cost Per Unit"), "labour_cost",
- null, "class='tableheader2'");
- amount_row(_("Standard Overhead Cost Per Unit"), "overhead_cost",
- null, "class='tableheader2'");
+ amount_row(_("Standard Labour Cost Per Unit"), "labour_cost", null, "class='tableheader2'", null, $dec2);
+ amount_row(_("Standard Overhead Cost Per Unit"), "overhead_cost", null, "class='tableheader2'", null, $dec3);
}
else
{