X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fcost_update.php;h=ff58f9eb8900ed0bbcca3c7c0293893a2f449e6a;hb=7062b64f28edd3b162974c293cd8cff839b1a579;hp=392160392290e1f027b4d0fa34ec4ee1adc9df9e;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 39216039..ff58f9eb 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -26,12 +26,11 @@ if (isset($_GET['stock_id']))
 }
 
 //--------------------------------------------------------------------------------------
-
 if (isset($_POST['UpdateData']))
 {
 
-   	$old_cost = input_num('OldMaterialCost') + input_num('OldLabourCost')
-	    + input_num('OldOverheadCost');
+   	$old_cost = $_POST['OldMaterialCost'] + $_POST['OldLabourCost']
+	    + $_POST['OldOverheadCost'];
    	$new_cost = input_num('material_cost') + input_num('labour_cost')
 	     + input_num('overhead_cost');
 
@@ -41,6 +40,7 @@ if (isset($_POST['UpdateData']))
 		!check_num('overhead_cost'))
 	{
 		display_error( _("The entered cost is not numeric."));
+		set_focus('material_cost');
    	 	$should_update = false;
 	}
 	elseif ($old_cost == $new_cost)
@@ -64,6 +64,8 @@ if (isset($_POST['UpdateData']))
    	}
 }
 
+if (isset($_POST['_stock_id_update']))
+	$Ajax->activate('cost_table');
 //-----------------------------------------------------------------------------------------
 
 start_form(false, true);
@@ -77,33 +79,35 @@ stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
 echo "</center><hr>";
 set_global_stock_item($_POST['stock_id']);
 
-$sql = "SELECT description, units, last_cost, actual_cost, material_cost, labour_cost,
+$sql = "SELECT description, units, material_cost, labour_cost,
 	overhead_cost, mb_flag
 	FROM ".TB_PREF."stock_master
 	WHERE stock_id='" . $_POST['stock_id'] . "'
-	GROUP BY description, units, last_cost, actual_cost, material_cost, labour_cost, overhead_cost, mb_flag";
+	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 = 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"), price_format($myrow["last_cost"]),
-	"class='tableheader2'", "nowrap align=right");
+
+$_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",
-	price_format($myrow["material_cost"]), "", "", "class='tableheader2'");
+	null, "class='tableheader2'");
 
 if ($myrow["mb_flag"]=='M')
 {
 	amount_row(_("Standard Labour Cost Per Unit"), "labour_cost",
-		price_format($myrow["labour_cost"]), '', "", "class='tableheader2'");
+		null, "class='tableheader2'");
 	amount_row(_("Standard Overhead Cost Per Unit"), "overhead_cost",
-		price_format($myrow["overhead_cost"]), "", "", "class='tableheader2'");
+		null, "class='tableheader2'");
 }
 else
 {
@@ -112,6 +116,7 @@ else
 }
 
 end_table(1);
+div_end();
 submit_center('UpdateData', _("Update"));
 
 end_form();