X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fcost_update.php;h=75f04a0e055fd833c4fd63c5d367d613c28b2fb3;hb=e27f352665019d956e8bb4dc4b4086146f6e0535;hp=845ec8494ddeaf8d77cd0aa67683376d55f12aa3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 845ec849..75f04a0e 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -1,20 +1,35 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_STANDARDCOST';
+if (!@$_GET['popup'])
+	$path_to_root = "..";
+else	
+	$path_to_root = "../..";
 
-$page_security = 2;
-$path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/banking.inc");
 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");
-$js = "";
-if ($use_popup_windows)
-	$js .= get_js_open_window(900, 500);
-page(_("Inventory Item Cost Update"), false, false, "", $js);
+
+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);
+}
 
 //--------------------------------------------------------------------------------------
 
@@ -26,22 +41,24 @@ if (isset($_GET['stock_id']))
 }
 
 //--------------------------------------------------------------------------------------
-
 if (isset($_POST['UpdateData']))
 {
 
-   	$old_cost = $_POST['OldMaterialCost'] + $_POST['OldLabourCost'] + $_POST['OldLabourCost'];
-   	$new_cost = $_POST['material_cost'] + $_POST['labour_cost'] + $_POST['overhead_cost'];
+	$old_cost = get_standard_cost($_POST['stock_id']);
+     
+   	$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) 
+	}
+	elseif ($old_cost == $new_cost)
 	{
    	 	display_error( _("The new cost is the same as the old cost. Cost was not updated."));
    	 	$should_update = false;
@@ -49,69 +66,78 @@ 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."));
+        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_notification(get_gl_view_str(ST_COSTUPDATE, $update_no, _("View the GL Journal Entries for this Cost Update")));
         }
+
    	}
 }
 
+if (list_updated('stock_id'))
+	$Ajax->activate('cost_table');
 //-----------------------------------------------------------------------------------------
 
-start_form(false, true);
+if (!@$_GET['popup'])
+	start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
 
-echo "<center>" . _("Item:"). "&nbsp;";
-stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
+if (!@$_GET['popup'])
+{
+	echo "<center>" . _("Item:"). "&nbsp;";
+	//echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
+	echo stock_items_list('stock_id', $_POST['stock_id'], false, true);
+
+	echo "</center><hr>";
+}
+else
+	br(2);
 
-echo "</center><hr>";
 set_global_stock_item($_POST['stock_id']);
 
-$sql = "SELECT description, units, last_cost, actual_cost, 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";
-$result = db_query($sql);
-check_db_error("The cost details for the item could not be retrieved", $sql);
-
-$myrow = db_fetch($result);
+$myrow = get_item($_POST['stock_id']);
 
-hidden("OldMaterialCost", $myrow["material_cost"]);
-hidden("OldLabourCost", $myrow["labour_cost"]);
-hidden("OldOverheadCost", $myrow["overhead_cost"]);
+div_start('cost_table');
 
-start_table($table_style2);
-label_row(_("Last Cost"), number_format2($myrow["last_cost"],user_price_dec()), 
-	"class='tableheader2'", "nowrap align=right");
+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);
 
-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", null, "class='tableheader2'", null, $dec1);
 
+if (@$_GET['popup'])
+{
+	hidden('_tabs_sel', get_post('_tabs_sel'));
+	hidden('popup', @$_GET['popup']);
+}
 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'");
-} 
-else 
+	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
 {
 	hidden("labour_cost", 0);
 	hidden("overhead_cost", 0);
 }
 
 end_table(1);
-submit_center('UpdateData', _("Update"));
-
-end_form();
-end_page();
+div_end();
+submit_center('UpdateData', _("Update"), true, false, 'default');
 
+if (!@$_GET['popup'])
+{
+	end_form();
+	end_page(@$_GET['popup'], false, false);
+}
 ?>