X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fmanage%2Fbom_edit.php;h=3b2e70d6043e839c5b98e488e0b046bc85efe45e;hb=ff0d5ae999496cdcd1f7eb1d47425340e61b44cf;hp=2df314090a9420c65b3bbec3435b44799eadaa6b;hpb=0b0690657989cd259e5966faaac7cacbfa89cee2;p=fa-stable.git diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index 2df31409..3b2e70d6 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 9; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -16,12 +25,14 @@ check_db_has_bom_stock_items(_("There are no manufactured or kit items defined i check_db_has_workcentres(_("There are no work centres defined in the system. BOMs require at least one work centre be defined.")); +simple_page_mode(true); +$selected_component = $selected_id; //-------------------------------------------------------------------------------------------------- -if (isset($_GET["NewItem"])) -{ - $_POST['stock_id'] = $_GET["NewItem"]; -} +//if (isset($_GET["NewItem"])) +//{ +// $_POST['stock_id'] = $_GET["NewItem"]; +//} if (isset($_GET['stock_id'])) { $_POST['stock_id'] = $_GET['stock_id']; @@ -29,7 +40,7 @@ if (isset($_GET['stock_id'])) } /* selected_parent could come from a post or a get */ -if (isset($_GET["selected_parent"])) +/*if (isset($_GET["selected_parent"])) { $selected_parent = $_GET["selected_parent"]; } @@ -37,16 +48,17 @@ else if (isset($_POST["selected_parent"])) { $selected_parent = $_POST["selected_parent"]; } +*/ /* selected_component could also come from a post or a get */ -if (isset($_GET["selected_component"])) +/*if (isset($_GET["selected_component"])) { $selected_component = $_GET["selected_component"]; } -elseif (isset($_POST["selected_component"])) +else { - $selected_component = $_POST["selected_component"]; + $selected_component = get_post("selected_component", -1); } - +*/ //-------------------------------------------------------------------------------------------------- @@ -102,10 +114,10 @@ div_start('bom'); label_cell($myrow["description"]); label_cell($myrow["location_name"]); label_cell($myrow["WorkCentreDescription"]); - label_cell(qty_format($myrow["quantity"])); + qty_cell($myrow["quantity"], false, get_qty_dec($myrow["component"])); label_cell($myrow["units"]); - edit_link_cell(SID . "NewItem=$selected_parent&selected_component=" . $myrow["id"]); - delete_link_cell(SID . "delete=" . $myrow["id"]. "&stock_id=" . $_POST['stock_id']); + edit_button_cell("Edit".$myrow['id'], _("Edit")); + delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } //END WHILE LIST LOOP @@ -115,7 +127,7 @@ div_end(); //-------------------------------------------------------------------------------------------------- -function on_submit($selected_parent, $selected_component=null) +function on_submit($selected_parent, $selected_component=-1) { if (!check_num('quantity', 0)) { @@ -124,7 +136,7 @@ function on_submit($selected_parent, $selected_component=null) return; } - if (isset($selected_parent) && isset($selected_component)) + if ($selected_component != -1) { $sql = "UPDATE ".TB_PREF."bom SET workcentre_added='" . $_POST['workcentre_added'] . "', @@ -135,9 +147,10 @@ function on_submit($selected_parent, $selected_component=null) check_db_error("Could not update this bom component", $sql); db_query($sql,"could not update bom"); - + display_notification(_('Selected component has been updated')); + $Mode = 'RESET'; } - elseif (!isset($selected_component) && isset($selected_parent)) + else { /*Selected component is null cos no item selected on first time round @@ -145,7 +158,7 @@ function on_submit($selected_parent, $selected_component=null) component form */ //need to check not recursive bom component of itself! - If (!check_for_recursive_bom($selected_parent, $_POST['component'])) + if (!check_for_recursive_bom($selected_parent, $_POST['component'])) { /*Now check to see that the component is not already on the bom */ @@ -164,9 +177,8 @@ function on_submit($selected_parent, $selected_component=null) . input_num('quantity') . ")"; db_query($sql,"check failed"); - - //$msg = _("A new component part has been added to the bill of material for this item."); - + display_notification(_("A new component part has been added to the bill of material for this item.")); + $Mode = 'RESET'; } else { @@ -184,103 +196,92 @@ function on_submit($selected_parent, $selected_component=null) //-------------------------------------------------------------------------------------------------- -if (isset($_GET['delete'])) +if ($Mode == 'Delete') { - - $sql = "DELETE FROM ".TB_PREF."bom WHERE id='" . $_GET['delete']. "'"; + $sql = "DELETE FROM ".TB_PREF."bom WHERE id='" . $selected_id. "'"; db_query($sql,"Could not delete this bom components"); - display_note(_("The component item has been deleted from this bom.")); + display_notification(_("The component item has been deleted from this bom")); + $Mode = 'RESET'; +} +if ($Mode == 'RESET') +{ + $selected_id = -1; + unset($_POST['quantity']); } //-------------------------------------------------------------------------------------------------- -start_form(false, true); -//echo $msg; +start_form(); echo "