X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fmanage%2Fbom_edit.php;h=9734dfa4d23c0af24f63d58493214569d8d5db9c;hb=884c36eec7dbaae89e1f5532cc2c2f8033b010fd;hp=8b978c7d8c4a57ec16ff496cacae2fca8ad4cd39;hpb=dda3d9ea37cd21153a3ec06012baad6ccb7be0cf;p=fa-stable.git diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index 8b978c7d..9734dfa4 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -1,10 +1,19 @@ . +***********************************************************************/ +$page_security = 'SA_BOM'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Bill Of Materials")); +page(_($help_context = "Bill Of Materials")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -53,44 +62,11 @@ else //-------------------------------------------------------------------------------------------------- -function check_for_recursive_bom($ultimate_parent, $component_to_check) -{ - - /* returns true ie 1 if the bom contains the parent part as a component - ie the bom is recursive otherwise false ie 0 */ - - $sql = "SELECT component FROM ".TB_PREF."bom WHERE parent='$component_to_check'"; - $result = db_query($sql,"could not check recursive bom"); - - if ($result != 0) - { - while ($myrow = db_fetch_row($result)) - { - if ($myrow[0] == $ultimate_parent) - { - return 1; - } - - if (check_for_recursive_bom($ultimate_parent, $myrow[0])) - { - return 1; - } - } //(while loop) - } //end if $result is true - - return 0; - -} //end of function check_for_recursive_bom - -//-------------------------------------------------------------------------------------------------- - function display_bom_items($selected_parent) { - global $table_style; - $result = get_bom($selected_parent); -div_start('bom'); - start_table("$table_style width=60%"); + div_start('bom'); + start_table(TABLESTYLE, "width=60%"); $th = array(_("Code"), _("Description"), _("Location"), _("Work Centre"), _("Quantity"), _("Units"),'',''); table_header($th); @@ -108,12 +84,12 @@ 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 end_table(); -div_end(); + div_end(); } //-------------------------------------------------------------------------------------------------- @@ -129,15 +105,8 @@ function on_submit($selected_parent, $selected_component=-1) if ($selected_component != -1) { - - $sql = "UPDATE ".TB_PREF."bom SET workcentre_added='" . $_POST['workcentre_added'] . "', - loc_code='" . $_POST['loc_code'] . "', - quantity= " . input_num('quantity') . " - WHERE parent='" . $selected_parent . "' - AND id='" . $selected_component . "'"; - check_db_error("Could not update this bom component", $sql); - - db_query($sql,"could not update bom"); + update_bom($selected_parent, $selected_component, $_POST['workcentre_added'], $_POST['loc_code'], + input_num('quantity')); display_notification(_('Selected component has been updated')); $Mode = 'RESET'; } @@ -153,21 +122,11 @@ function on_submit($selected_parent, $selected_component=-1) { /*Now check to see that the component is not already on the bom */ - $sql = "SELECT component FROM ".TB_PREF."bom - WHERE parent='$selected_parent' - AND component='" . $_POST['component'] . "' - AND workcentre_added='" . $_POST['workcentre_added'] . "' - AND loc_code='" . $_POST['loc_code'] . "'" ; - $result = db_query($sql,"check failed"); - - if (db_num_rows($result) == 0) + if (!is_component_already_on_bom($_POST['component'], $_POST['workcentre_added'], + $_POST['loc_code'], $selected_parent)) { - $sql = "INSERT INTO ".TB_PREF."bom (parent, component, workcentre_added, loc_code, quantity) - VALUES ('$selected_parent', '" . $_POST['component'] . "', '" - . $_POST['workcentre_added'] . "', '" . $_POST['loc_code'] . "', " - . input_num('quantity') . ")"; - - db_query($sql,"check failed"); + add_bom($selected_parent, $_POST['component'], $_POST['workcentre_added'], + $_POST['loc_code'], input_num('quantity')); display_notification(_("A new component part has been added to the bill of material for this item.")); $Mode = 'RESET'; } @@ -189,8 +148,7 @@ function on_submit($selected_parent, $selected_component=-1) if ($Mode == 'Delete') { - $sql = "DELETE FROM ".TB_PREF."bom WHERE id='" . $selected_component. "'"; - db_query($sql,"Could not delete this bom components"); + delete_bom($selected_id); display_notification(_("The component item has been deleted from this bom")); $Mode = 'RESET'; @@ -198,64 +156,62 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { - $selected_component = -1; + $selected_id = -1; unset($_POST['quantity']); } //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); -echo "