X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fmanage%2Fbom_edit.php;h=2df314090a9420c65b3bbec3435b44799eadaa6b;hb=0ddbffd3121056b6cf10dbd715d72d10fffdf253;hp=6e30c49727643940275799cc479114eecf244afb;hpb=941b8dccfaa9fdf44286100c056836979b9eef70;p=fa-stable.git diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index 6e30c497..2df31409 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -86,7 +86,7 @@ function display_bom_items($selected_parent) global $table_style; $result = get_bom($selected_parent); - +div_start('bom'); start_table("$table_style width=60%"); $th = array(_("Code"), _("Description"), _("Location"), _("Work Centre"), _("Quantity"), _("Units"),'',''); @@ -102,7 +102,7 @@ function display_bom_items($selected_parent) label_cell($myrow["description"]); label_cell($myrow["location_name"]); label_cell($myrow["WorkCentreDescription"]); - label_cell($myrow["quantity"]); + label_cell(qty_format($myrow["quantity"])); 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']); @@ -110,31 +110,26 @@ function display_bom_items($selected_parent) } //END WHILE LIST LOOP end_table(); +div_end(); } //-------------------------------------------------------------------------------------------------- -function on_submit($selected_parent, $selected_component) +function on_submit($selected_parent, $selected_component=null) { - if (!is_numeric($_POST['quantity'])) - { - display_error(_("The quantity entered must be numeric.")); - return; - } - - if ($_POST['quantity'] <= 0) + if (!check_num('quantity', 0)) { - display_error(_("The quantity entered must be greater than zero.")); + display_error(_("The quantity entered must be numeric and greater than zero.")); + set_focus('quantity'); return; } - if (isset($selected_parent) && isset($selected_component)) { $sql = "UPDATE ".TB_PREF."bom SET workcentre_added='" . $_POST['workcentre_added'] . "', loc_code='" . $_POST['loc_code'] . "', - quantity= " . $_POST['quantity'] . " + quantity= " . input_num('quantity') . " WHERE parent='" . $selected_parent . "' AND id='" . $selected_component . "'"; check_db_error("Could not update this bom component", $sql); @@ -145,7 +140,9 @@ function on_submit($selected_parent, $selected_component) elseif (!isset($selected_component) && isset($selected_parent)) { - /*Selected component is null cos no item selected on first time round so must be adding a record must be Submitting new entries in the new component form */ + /*Selected component is null cos no item selected on first time round + so must be adding a record must be Submitting new entries in the new + component form */ //need to check not recursive bom component of itself! If (!check_for_recursive_bom($selected_parent, $_POST['component'])) @@ -162,7 +159,9 @@ function on_submit($selected_parent, $selected_component) if (db_num_rows($result) == 0) { $sql = "INSERT INTO ".TB_PREF."bom (parent, component, workcentre_added, loc_code, quantity) - VALUES ('$selected_parent', '" . $_POST['component'] . "', '" . $_POST['workcentre_added'] . "', '" . $_POST['loc_code'] . "', " . $_POST['quantity'] . ")"; + VALUES ('$selected_parent', '" . $_POST['component'] . "', '" + . $_POST['workcentre_added'] . "', '" . $_POST['loc_code'] . "', " + . input_num('quantity') . ")"; db_query($sql,"check failed"); @@ -202,18 +201,23 @@ start_form(false, true); echo "