X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=manufacturing%2Fmanage%2Fbom_edit.php;h=35230ddb5ab0a70ccb489d1e7be0adbb0d1ee8a2;hb=e01ce098c8862750e2f4f66f255191e83a4ce1d6;hp=fe373a1c373c3bcf9aa6812aea9b86c0fb81f601;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git
diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php
index fe373a1c..35230ddb 100644
--- a/manufacturing/manage/bom_edit.php
+++ b/manufacturing/manage/bom_edit.php
@@ -13,14 +13,12 @@ $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");
include_once($path_to_root . "/includes/data_checks.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
-
check_db_has_bom_stock_items(_("There are no manufactured or kit items defined in the system."));
check_db_has_workcentres(_("There are no work centres defined in the system. BOMs require at least one work centre be defined."));
@@ -29,77 +27,19 @@ simple_page_mode(true);
$selected_component = $selected_id;
//--------------------------------------------------------------------------------------------------
-//if (isset($_GET["NewItem"]))
-//{
-// $_POST['stock_id'] = $_GET["NewItem"];
-//}
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"]))
-{
- $selected_parent = $_GET["selected_parent"];
-}
-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"]))
-{
- $selected_component = $_GET["selected_component"];
-}
-else
-{
- $selected_component = get_post("selected_component", -1);
-}
-*/
-
-//--------------------------------------------------------------------------------------------------
-
-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=".db_escape($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);
@@ -122,7 +62,7 @@ div_start('bom');
} //END WHILE LIST LOOP
end_table();
-div_end();
+ div_end();
}
//--------------------------------------------------------------------------------------------------
@@ -138,15 +78,8 @@ function on_submit($selected_parent, $selected_component=-1)
if ($selected_component != -1)
{
-
- $sql = "UPDATE ".TB_PREF."bom SET workcentre_added=".db_escape($_POST['workcentre_added'])
- . ",loc_code=".db_escape($_POST['loc_code']) . ",
- quantity= " . input_num('quantity') . "
- WHERE parent=".db_escape($selected_parent) . "
- AND id=".db_escape($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';
}
@@ -162,21 +95,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=".db_escape($selected_parent)."
- AND component=".db_escape($_POST['component']) . "
- AND workcentre_added=".db_escape($_POST['workcentre_added']) . "
- AND loc_code=".db_escape($_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 (".db_escape($selected_parent).", ".db_escape($_POST['component']) . ","
- .db_escape($_POST['workcentre_added']) . ", ".db_escape($_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';
}
@@ -198,8 +121,7 @@ function on_submit($selected_parent, $selected_component=-1)
if ($Mode == 'Delete')
{
- $sql = "DELETE FROM ".TB_PREF."bom WHERE id=".db_escape($selected_id);
- 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';
@@ -216,10 +138,15 @@ if ($Mode == 'RESET')
start_form();
start_form(false, true);
-start_table("class='tablestyle_noborder'");
-stock_manufactured_items_list_row(_("Select a manufacturable item:"), 'stock_id', null, false, true);
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+stock_manufactured_items_list_cells(_("Select a manufacturable item:"), 'stock_id', null, false, true);
+end_row();
if (list_updated('stock_id'))
+{
+ $selected_id = -1;
$Ajax->activate('_page_body');
+}
end_table();
br();
@@ -238,35 +165,29 @@ start_form();
//--------------------------------------------------------------------------------------
echo '
';
- start_table($table_style2);
+ start_table(TABLESTYLE2);
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=".db_escape($selected_id)."
- AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component";
-
- $result = db_query($sql, "could not get bom");
- $myrow = db_fetch($result);
+ $myrow = get_component_from_bom($selected_id);
$_POST['loc_code'] = $myrow["loc_code"];
$_POST['component'] = $myrow["component"]; // by Tom Moulton
$_POST['workcentre_added'] = $myrow["workcentre_added"];
$_POST['quantity'] = number_format2($myrow["quantity"], get_qty_dec($myrow["component"]));
- label_row(_("Component:"), $myrow["component"] . " - " . $myrow["description"]);
+ label_row(_("Component:"), $myrow["component"] . " - " . $myrow["description"]);
}
hidden('selected_id', $selected_id);
}
else
{
start_row();
- label_cell(_("Component:"));
+ label_cell(_("Component:"), "class='label'");
echo "";
- stock_component_items_list('component', $selected_parent, null, false, true);
+ echo stock_component_items_list('component', $selected_parent, null, false, true);
if (get_post('_component_update'))
{
$Ajax->activate('quantity');
@@ -274,7 +195,7 @@ start_form();
echo " | ";
end_row();
}
- hidden('stock_id', $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);
@@ -290,4 +211,3 @@ start_form();
end_page();
-?>