X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fcost_update.php;h=8abab67198a3ccec976d9ea4c0a1c4d8a8e73f77;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=b5ee125dd966fab6f3094b8360c60692e950d428;hpb=71320995d00d480a7177fe7ea1acc62c7d00baec;p=fa-stable.git

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index b5ee125d..8abab671 100644
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -10,16 +10,19 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_STANDARDCOST';
-$path_to_root = "..";
-include_once($path_to_root . "/includes/session.inc");
+if (!@$_GET['popup'])
+	$path_to_root = "..";
+else	
+	$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);
@@ -39,7 +42,7 @@ if (isset($_POST['UpdateData']))
 {
 
 	$old_cost = get_standard_cost($_POST['stock_id']);
-     
+
    	$new_cost = input_num('material_cost') + input_num('labour_cost')
 	     + input_num('overhead_cost');
 
@@ -68,8 +71,9 @@ if (isset($_POST['UpdateData']))
 
         if ($update_no > 0)
         {
-    		display_note(get_gl_view_str(ST_COSTUPDATE, $update_no, _("View the GL Journal Entries for this Cost Update")), 0, 1);
+    		display_notification(get_gl_view_str(ST_COSTUPDATE, $update_no, _("View the GL Journal Entries for this Cost Update")));
         }
+
    	}
 }
 
@@ -77,16 +81,25 @@ if (list_updated('stock_id'))
 	$Ajax->activate('cost_table');
 //-----------------------------------------------------------------------------------------
 
-start_form();
+$action = $_SERVER['PHP_SELF'];
+if ($page_nested)
+	$action .= "?stock_id=".get_post('stock_id');
+start_form(false, false, $action);
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
 
-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);
+if (!$page_nested)
+{
+	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']);
 
 $myrow = get_item($_POST['stock_id']);
@@ -100,6 +113,11 @@ $_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 ($page_nested)
+{
+	hidden('popup', @$_GET['popup']);
+}
 if ($myrow["mb_flag"]=='M')
 {
 	amount_row(_("Standard Labour Cost Per Unit"), "labour_cost", null, "class='tableheader2'", null, $dec2);
@@ -117,5 +135,3 @@ submit_center('UpdateData', _("Update"), true, false, 'default');
 
 end_form();
 end_page();
-
-?>