X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitem_units.php;h=39be1be54d192d1c986488d67063d1aa50a68907;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=fa84a350d14885d7703192dfee45c986f9e2620f;hpb=b61fe995e432d77ff3ff0b5850bb921920f3befb;p=fa-stable.git

diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php
index fa84a350..39be1be5 100644
--- a/inventory/manage/item_units.php
+++ b/inventory/manage/item_units.php
@@ -1,16 +1,16 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 11;
-$path_to_root="../..";
+$page_security = 'SA_UOM';
+$path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
 page(_("Units of Measure"));
@@ -74,15 +74,19 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
 	$selected_id = '';
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $sav;
 }
 
 //----------------------------------------------------------------------------------
 
-$result = get_all_item_units();
+$result = get_all_item_units(check_value('show_inactive'));
+
 start_form();
 start_table("$table_style width=40%");
 $th = array(_('Unit'), _('Description'), _('Decimals'), "", "");
+inactive_control_column($th);
 
 table_header($th);
 $k = 0; //row colour counter
@@ -96,19 +100,17 @@ while ($myrow = db_fetch($result))
 	label_cell($myrow["name"]);
 	label_cell(($myrow["decimals"]==-1?_("User Quantity Decimals"):$myrow["decimals"]));
 
- 	edit_button_cell("Edit".$myrow[0], _("Edit"));
- 	delete_button_cell("Delete".$myrow[0], _("Delete"));
+	inactive_control_cell($myrow["abbr"], $myrow["inactive"], 'item_units', 'abbr');
+ 	edit_button_cell("Edit".$myrow["abbr"], _("Edit"));
+ 	delete_button_cell("Delete".$myrow["abbr"], _("Delete"));
 	end_row();
 }
 
-end_table();
-end_form();
-echo '<br>';
+inactive_control_row($th);
+end_table(1);
 
 //----------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != '') 
@@ -135,7 +137,7 @@ number_list_row(_("Decimal Places:"), 'decimals', null, 0, 6, _("User Quantity D
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == '', '', true);
+submit_add_or_update_center($selected_id == '', '', 'both');
 
 end_form();