Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / inventory / manage / movement_types.php

diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php
index 60b8e83e30ce52fcb6ac91659a4b68d18fefaf3d..b9d7f79d22f7120a72b957d36b368d8888f71362 100644 (file)
--- a/inventory/manage/movement_types.php
+++ b/inventory/manage/movement_types.php
@@ -13,7 +13,7 @@ $page_security = 'SA_INVENTORYMOVETYPE';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Inventory Movement Types"));
+page(_($help_context = "Inventory Movement Types"));
 
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
@@ -56,12 +56,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 function can_delete($selected_id)
 {
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves 
-               WHERE type=" . ST_INVADJUST. " AND person_id=".db_escape($selected_id);
-
-       $result = db_query($sql, "could not query stock moves");
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (movement_types_in_stock_moves($selected_id))
        {
                display_error(_("Cannot delete this inventory movement type because item transactions have been created referring to it."));
                return false;
@@ -95,7 +90,7 @@ if ($Mode == 'RESET')
 $result = get_all_movement_type(check_value('show_inactive'));
 
 start_form();
-start_table("$table_style width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Description"), "", "");
 inactive_control_column($th);
@@ -117,7 +112,7 @@ end_table(1);
 
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -143,4 +138,3 @@ end_form();
 
 end_page();
 
-?>