X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fcost_update.php;h=82dfb0db4eaf8d695088b3d1c175c39409f120d9;hb=412b79dc32855f813d03a8a6dd9debd45bb308f5;hp=6b6c5950434280ae0f5608d13263711471685411;hpb=e3f700d1e11788f176bf02c7b9969780e66dc167;p=fa-stable.git

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 6b6c5950..82dfb0db 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -30,15 +30,18 @@ if (isset($_GET['stock_id']))
 if (isset($_POST['UpdateData']))
 {
 
-   	$old_cost = $_POST['OldMaterialCost'] + $_POST['OldLabourCost'] + $_POST['OldOverheadCost'];
-   	$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)
@@ -49,8 +52,9 @@ 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."));
 
@@ -61,6 +65,8 @@ if (isset($_POST['UpdateData']))
    	}
 }
 
+if (isset($_POST['_stock_id_update']))
+	$Ajax->activate('cost_table');
 //-----------------------------------------------------------------------------------------
 
 start_form(false, true);
@@ -83,24 +89,24 @@ $result = db_query($sql);
 check_db_error("The cost details for the item could not be retrieved", $sql);
 
 $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);
-label_row(_("Last Cost"), number_format2($myrow["last_cost"],user_price_dec()),
+label_row(_("Last Cost"), price_format($myrow["last_cost"]),
 	"class='tableheader2'", "nowrap align=right");
 
-text_row(_("Standard Material Cost Per Unit"), "material_cost",
-	number_format($myrow["material_cost"],user_price_dec()), "", "", "class='tableheader2'");
+amount_row(_("Standard Material Cost Per Unit"), "material_cost",
+	price_format($myrow["material_cost"]), "class='tableheader2'");
 
 if ($myrow["mb_flag"]=='M')
 {
-	text_row(_("Standard Labour Cost Per Unit"), "labour_cost",
-		number_format($myrow["labour_cost"],user_price_dec()), "", "", "class='tableheader2'");
-	text_row(_("Standard Overhead Cost Per Unit"), "overhead_cost",
-		number_format($myrow["overhead_cost"],user_price_dec()), "", "", "class='tableheader2'");
+	amount_row(_("Standard Labour Cost Per Unit"), "labour_cost",
+		price_format($myrow["labour_cost"]), "class='tableheader2'");
+	amount_row(_("Standard Overhead Cost Per Unit"), "overhead_cost",
+		price_format($myrow["overhead_cost"]), "class='tableheader2'");
 }
 else
 {
@@ -109,6 +115,7 @@ else
 }
 
 end_table(1);
+div_end();
 submit_center('UpdateData', _("Update"));
 
 end_form();