Fixed sql query (duplicated rows in result).

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

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 392160392290e1f027b4d0fa34ec4ee1adc9df9e..48e75ebaa986635ea885ce5815c5f8c06aa5a144 100644 (file)
--- 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)
@@ -51,19 +51,21 @@ if (isset($_POST['UpdateData']))
 
        if ($should_update)
        {
-               $update_no = stock_cost_update($_POST['stock_id'], 
-                   input_num('material_cost'), input_num('labour_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."));
+        display_notification(_("Cost has been updated."));
 
         if ($update_no > 0)
         {
-               display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 1, 0);
+               display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 0, 1);
         }
        }
 }
 
+if (list_updated('stock_id'))
+       $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();