X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fmanage%2Fbom_edit.php;h=84f60733f7d2a1b4e84874414efeb8b516abc525;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=09dfd5e9039f129bf3c94b0d658e6d8bfc5430a4;hpb=8cac19c37c960e50f7c11964510c0d09a530e7b5;p=fa-stable.git

diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php
index 09dfd5e9..84f60733 100644
--- a/manufacturing/manage/bom_edit.php
+++ b/manufacturing/manage/bom_edit.php
@@ -1,5 +1,14 @@
 <?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 = 9;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
@@ -24,11 +33,11 @@ $selected_component = $selected_id;
 //{
 //	$_POST['stock_id'] = $_GET["NewItem"];
 //}
-//if (isset($_GET['stock_id']))
-//{
-//	$_POST['stock_id'] = $_GET['stock_id'];
-//	$selected_parent =  $_GET['stock_id'];
-//}
+if (isset($_GET['stock_id']))
+{
+	$_POST['stock_id'] = $_GET['stock_id'];
+	$selected_parent =  $_GET['stock_id'];
+}
 
 /* selected_parent could come from a post or a get */
 /*if (isset($_GET["selected_parent"]))
@@ -108,7 +117,7 @@ div_start('bom');
         qty_cell($myrow["quantity"], false, get_qty_dec($myrow["component"]));
         label_cell($myrow["units"]);
  		edit_button_cell("Edit".$myrow['id'], _("Edit"));
- 		edit_button_cell("Delete".$myrow['id'], _("Delete"));
+ 		delete_button_cell("Delete".$myrow['id'], _("Delete"));
         end_row();
 
 	} //END WHILE LIST LOOP
@@ -189,7 +198,7 @@ function on_submit($selected_parent, $selected_component=-1)
 
 if ($Mode == 'Delete')
 {
-	$sql = "DELETE FROM ".TB_PREF."bom WHERE id='" . $selected_component. "'";
+	$sql = "DELETE FROM ".TB_PREF."bom WHERE id='" . $selected_id. "'";
 	db_query($sql,"Could not delete this bom components");
 
 	display_notification(_("The component item has been deleted from this bom"));
@@ -198,7 +207,7 @@ if ($Mode == 'Delete')
 
 if ($Mode == 'RESET')
 {
-	$selected_component = -1;
+	$selected_id = -1;
 	unset($_POST['quantity']);
 }
 
@@ -207,19 +216,19 @@ if ($Mode == 'RESET')
 start_form(false, true);
 
 echo "<center>" . _("Select a manufacturable item:") . "&nbsp;";
-stock_bom_items_list('selected_parent', null, false, true);
+stock_bom_items_list('stock_id', null, false, true);
 echo "</center><br>";
 
 end_form();
-if (isset($_POST['_selected_parent_update']))
+if (isset($_POST['_stock_id_update']))
 	$Ajax->activate('_page_body');
 //--------------------------------------------------------------------------------------------------
 
-if (get_post('selected_parent') != '')
+if (get_post('stock_id') != '')
 { //Parent Item selected so display bom or edit component
-	$selected_parent = $_POST['selected_parent'];
+	$selected_parent = $_POST['stock_id'];
 	if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
-		on_submit($selected_parent, $selected_component);
+		on_submit($selected_parent, $selected_id);
 	//--------------------------------------------------------------------------------------
 
 start_form();
@@ -231,12 +240,12 @@ start_form();
 
 	start_table($table_style2);
 
-	if ($selected_component != -1)
+	if ($selected_id != -1)
 	{
  		if ($Mode == 'Edit') {
 			//editing a selected component from the link to the line item
 			$sql = "SELECT ".TB_PREF."bom.*,".TB_PREF."stock_master.description FROM ".TB_PREF."bom,".TB_PREF."stock_master
-				WHERE id='$selected_component'
+				WHERE id='$selected_id'
 				AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component";
 
 			$result = db_query($sql, "could not get bom");
@@ -245,9 +254,9 @@ start_form();
 			$_POST['loc_code'] = $myrow["loc_code"];
 			$_POST['workcentre_added']  = $myrow["workcentre_added"];
 			$_POST['quantity'] = number_format2($myrow["quantity"], get_qty_dec($myrow["component"]));
-		}
-		hidden('component', $selected_component);
 		label_row(_("Component:"), $myrow["component"] . " - " . $myrow["description"]);
+		}
+		hidden('selected_id', $selected_id);
 	}
 	else
 	{
@@ -263,7 +272,7 @@ start_form();
 		echo "</td>";
 		end_row();
 	}
-	hidden('selected_parent', $selected_parent);
+	hidden('stock_id', $selected_parent);
 
 	locations_list_row(_("Location to Draw From:"), 'loc_code', null);
 	workcenter_list_row(_("Work Centre Added:"), 'workcentre_added', null);
@@ -272,7 +281,7 @@ start_form();
 	qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
 
 	end_table(1);
-	submit_add_or_update_center($selected_component == -1, '', true);
+	submit_add_or_update_center($selected_id == -1, '', true);
 	end_form();
 }
 // ----------------------------------------------------------------------------------