From f2343f51b0ed0d9abd2ec98b64f202beb9716d37 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 6 Apr 2015 16:24:54 +0200 Subject: [PATCH] Partial (inventory related) include files cleanup. --- dimensions/dimension_entry.php | 1 - includes/db/inventory_db.inc | 14 ++++++++++++++ includes/db/manufacturing_db.inc | 13 ------------- includes/{manufacturing.inc => inventory.inc} | 5 +---- inventory/cost_update.php | 1 - inventory/includes/inventory_db.inc | 2 +- inventory/inquiry/stock_status.php | 2 +- inventory/manage/item_codes.php | 1 - inventory/manage/sales_kits.php | 2 -- inventory/purchasing_data.php | 1 - manufacturing/includes/manufacturing_db.inc | 1 + manufacturing/inquiry/bom_cost_inquiry.php | 1 - manufacturing/manage/bom_edit.php | 2 -- manufacturing/view/wo_costs_view.php | 1 - manufacturing/view/wo_issue_view.php | 1 - manufacturing/view/wo_production_view.php | 1 - manufacturing/view/work_order_view.php | 1 - manufacturing/work_order_add_finished.php | 3 +-- manufacturing/work_order_costs.php | 3 +-- manufacturing/work_order_entry.php | 1 - manufacturing/work_order_release.php | 1 - purchasing/includes/purchasing_db.inc | 2 +- sales/customer_credit_invoice.php | 1 - sales/customer_delivery.php | 1 - sales/customer_invoice.php | 1 - sales/includes/sales_db.inc | 2 +- sales/includes/ui/sales_order_ui.inc | 1 - 27 files changed, 22 insertions(+), 44 deletions(-) rename includes/{manufacturing.inc => inventory.inc} (85%) diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php index d5c4f2a9..7809bd1b 100644 --- a/dimensions/dimension_entry.php +++ b/dimensions/dimension_entry.php @@ -14,7 +14,6 @@ $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/admin/db/tags_db.inc"); diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index b0807f19..48aa125d 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -445,3 +445,17 @@ function get_location_name($loc_code) display_db_error("could not retreive the location name for $loc_code", $sql, true); } + +function get_mb_flag($stock_id) +{ + $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = " + .db_escape($stock_id); + $result = db_query($sql, "retreive mb_flag from item"); + + if (db_num_rows($result) == 0) + return -1; + + $myrow = db_fetch_row($result); + return $myrow[0]; +} + diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc index aba53fa7..6473ba4b 100644 --- a/includes/db/manufacturing_db.inc +++ b/includes/db/manufacturing_db.inc @@ -179,19 +179,6 @@ function get_on_worder_qty($stock_id, $location) return $qoo; } -function get_mb_flag($stock_id) -{ - $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql, "retreive mb_flag from item"); - - if (db_num_rows($result) == 0) - return -1; - - $myrow = db_fetch_row($result); - return $myrow[0]; -} - //-------------------------------------------------------------------------------------- function add_bom($selected_parent, $component, $workcentre_added, $loc_code, $quantity) diff --git a/includes/manufacturing.inc b/includes/inventory.inc similarity index 85% rename from includes/manufacturing.inc rename to includes/inventory.inc index a68b89e0..84638a8e 100644 --- a/includes/manufacturing.inc +++ b/includes/inventory.inc @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -include_once($path_to_root . "/includes/db/manufacturing_db.inc"); +include_once($path_to_root . "/includes/db/inventory_db.inc"); function is_manufactured($mb_flag) @@ -31,6 +31,3 @@ function has_stock_holding($mb_flag) { return is_purchased($mb_flag) || is_manufactured($mb_flag); } - -//-------------------------------------------------------------------------------------- - diff --git a/inventory/cost_update.php b/inventory/cost_update.php index 4fcb852d..be6a19e6 100644 --- a/inventory/cost_update.php +++ b/inventory/cost_update.php @@ -19,7 +19,6 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); diff --git a/inventory/includes/inventory_db.inc b/inventory/includes/inventory_db.inc index 4b612552..7277dde3 100644 --- a/inventory/includes/inventory_db.inc +++ b/inventory/includes/inventory_db.inc @@ -11,7 +11,7 @@ ***********************************************************************/ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/banking.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); +include_once($path_to_root . "/includes/inventory.inc"); include_once($path_to_root . "/inventory/includes/db/items_category_db.inc"); include_once($path_to_root . "/inventory/includes/db/items_trans_db.inc"); diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php index f5dde130..f4093075 100644 --- a/inventory/inquiry/stock_status.php +++ b/inventory/inquiry/stock_status.php @@ -20,10 +20,10 @@ if (isset($_GET['stock_id'])) include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); +include_once($path_to_root . "/includes/db/manufacturing_db.inc"); if (list_updated('stock_id')) $Ajax->activate('status_tbl'); diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php index 3a8c199f..11d918c6 100644 --- a/inventory/manage/item_codes.php +++ b/inventory/manage/item_codes.php @@ -17,7 +17,6 @@ page(_($help_context = "Foreign Item Codes")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); check_db_has_purchasable_items(_("There are no inventory items defined in the system.")); diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php index b45ab363..ab4831f0 100644 --- a/inventory/manage/sales_kits.php +++ b/inventory/manage/sales_kits.php @@ -19,8 +19,6 @@ 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_stock_items(_("There are no items defined in the system.")); simple_page_mode(true); diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php index 65577282..676540f7 100644 --- a/inventory/purchasing_data.php +++ b/inventory/purchasing_data.php @@ -18,7 +18,6 @@ else include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); page(_($help_context = "Supplier Purchasing Data")); diff --git a/manufacturing/includes/manufacturing_db.inc b/manufacturing/includes/manufacturing_db.inc index 17af9db2..16428eec 100644 --- a/manufacturing/includes/manufacturing_db.inc +++ b/manufacturing/includes/manufacturing_db.inc @@ -9,6 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ +include_once($path_to_root . "/includes/db/manufacturing_db.inc"); include_once($path_to_root . "/manufacturing/includes/db/work_centres_db.inc"); include_once($path_to_root . "/manufacturing/includes/db/work_orders_db.inc"); include_once($path_to_root . "/manufacturing/includes/db/work_order_costing_db.inc"); diff --git a/manufacturing/inquiry/bom_cost_inquiry.php b/manufacturing/inquiry/bom_cost_inquiry.php index 0a594aa1..02605b56 100644 --- a/manufacturing/inquiry/bom_cost_inquiry.php +++ b/manufacturing/inquiry/bom_cost_inquiry.php @@ -16,7 +16,6 @@ include_once($path_to_root . "/includes/session.inc"); page(_($help_context = "Costed Bill Of Material Inquiry")); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/data_checks.inc"); diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index f9218caa..aca1d761 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -19,8 +19,6 @@ 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.")); diff --git a/manufacturing/view/wo_costs_view.php b/manufacturing/view/wo_costs_view.php index ff474a97..6e139ec6 100644 --- a/manufacturing/view/wo_costs_view.php +++ b/manufacturing/view/wo_costs_view.php @@ -20,7 +20,6 @@ if ($SysPrefs->use_popup_windows) page(_($help_context = "View Work Order Costs"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); diff --git a/manufacturing/view/wo_issue_view.php b/manufacturing/view/wo_issue_view.php index 6787dee6..799a2b47 100644 --- a/manufacturing/view/wo_issue_view.php +++ b/manufacturing/view/wo_issue_view.php @@ -19,7 +19,6 @@ if ($SysPrefs->use_popup_windows) page(_($help_context = "View Work Order Issue"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php index 0661fd1e..6cd68020 100644 --- a/manufacturing/view/wo_production_view.php +++ b/manufacturing/view/wo_production_view.php @@ -20,7 +20,6 @@ if ($SysPrefs->use_popup_windows) page(_($help_context = "View Work Order Production"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php index b298555e..4d999ab9 100644 --- a/manufacturing/view/work_order_view.php +++ b/manufacturing/view/work_order_view.php @@ -15,7 +15,6 @@ $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php index 1d42cbf6..fefbf1b5 100644 --- a/manufacturing/work_order_add_finished.php +++ b/manufacturing/work_order_add_finished.php @@ -12,11 +12,10 @@ $page_security = 'SA_MANUFRECEIVE'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/inventory.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans.inc"); -include_once($path_to_root . "/includes/db/inventory_db.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index 32184da9..df0ea058 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -12,11 +12,10 @@ $page_security = 'SA_WORKORDERCOST'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/inventory.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans.inc"); -include_once($path_to_root . "/includes/db/inventory_db.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index 37d761e1..ccc2635e 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -15,7 +15,6 @@ $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); diff --git a/manufacturing/work_order_release.php b/manufacturing/work_order_release.php index 2837f5e9..0f274fd8 100644 --- a/manufacturing/work_order_release.php +++ b/manufacturing/work_order_release.php @@ -14,7 +14,6 @@ $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc index 5aa8be94..7b18d6ca 100644 --- a/purchasing/includes/purchasing_db.inc +++ b/purchasing/includes/purchasing_db.inc @@ -12,10 +12,10 @@ include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc"); include_once($path_to_root . "/includes/banking.inc"); +include_once($path_to_root . "/includes/inventory.inc"); include_once($path_to_root . "/includes/date_functions.inc"); -include_once($path_to_root . "/includes/db/inventory_db.inc"); include_once($path_to_root . "/includes/db/allocations_db.inc"); include_once($path_to_root . "/purchasing/includes/db/supp_trans_db.inc"); diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index 5713a9a2..7cf3856d 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -20,7 +20,6 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 422b93c0..a49c5c55 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -19,7 +19,6 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 2f4d0598..ec423402 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -19,7 +19,6 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc index 965238f7..1698e40a 100644 --- a/sales/includes/sales_db.inc +++ b/sales/includes/sales_db.inc @@ -10,7 +10,7 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/includes/banking.inc"); -include_once($path_to_root . "/includes/db/inventory_db.inc"); +include_once($path_to_root . "/includes/inventory.inc"); include_once($path_to_root . "/includes/db/allocations_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_order_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_credit_db.inc"); diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index ce0b8604..a515859b 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -10,7 +10,6 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/sales/includes/cart_class.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); //-------------------------------------------------------------------------------- function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $description='') -- 2.30.2