Merged changes from master branch up to current state.

[fa-stable.git] / manufacturing / manage / work_centres.php

diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php
index 769d1b4b04c40f91ac6c53563ea5bd3237f82687..852c417c6f9c50447e81cb22031e0fb04d17f016 100644 (file)
--- a/manufacturing/manage/work_centres.php
+++ b/manufacturing/manage/work_centres.php
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="../..";
+$page_security = 'SA_WORKCENTRES';
+$path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Work Centres"));
+page(_($help_context = "Work Centres"));
 
 include($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 
@@ -56,19 +56,13 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 function can_delete($selected_id)
 {
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."bom WHERE workcentre_added='$selected_id'";      
-       $result = db_query($sql, "check can delete work centre");
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (key_in_foreign_table($selected_id, 'bom', 'workcentre_added'))
        {
                display_error(_("Cannot delete this work centre because BOMs have been created referring to it."));
                return false;
        }
-       
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."wo_requirements WHERE workcentre='$selected_id'";
-       $result = db_query($sql, "check can delete work centre");
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+
+       if (key_in_foreign_table($selected_id, 'wo_requirements', 'workcentre'))        
        {
                display_error(_("Cannot delete this work centre because work order requirements have been created referring to it."));
                return false;
@@ -103,7 +97,7 @@ if ($Mode == 'RESET')
 $result = get_all_work_centres(check_value('show_inactive'));
 
 start_form();
-start_table("$table_style width=50%");
+start_table(TABLESTYLE, "width='50%'");
 $th = array(_("Name"), _("description"), "", "");
 inactive_control_column($th);
 table_header($th);
@@ -126,7 +120,7 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -153,4 +147,3 @@ end_form();
 
 end_page();
 
-?>