- Changes from projop: Small fixes to make the new finance

  run under a new server

sql/oracle/intranet-categories.sql

@@ -409,6 +409,7 @@ insert into im_categories ( CATEGORY_DESCRIPTION, ENABLED_P, CATEGORY_ID, CATEGO
 -- Unit or Mesurement
 INSERT INTO im_categories VALUES (320,'Hour','','Intranet UoM','category','t','f');
 INSERT INTO im_categories VALUES (321,'Day','','Intranet UoM','category','t','f');
+INSERT INTO im_categories VALUES (322,'Unit','','Intranet UoM','category','t','f');
 -- Page, S-Word, T-Word, S-Line, T-Line defined in intranet-translation
 
 

sql/oracle/upgrade/upgrade-2.0.2-2.1.0.sql

+@../intranet-core-create.sql
+
+
+update	im_categories 
+set	category_type='Intranet UoM' 
+where 
+	category_type='Intranet Translation UoM'
+;
+

tcl/intranet-design-procs.tcl

@@ -472,7 +472,7 @@ append navbar "
 
 
 
-ad_proc -public im_admin_navbar { } {
+ad_proc -public im_admin_navbar { {select_label ""} } {
     Setup a sub-navbar with tabs for each area, highlighted depending
     on the local URL and enabled depending on the user permissions.
 } {
@@ -480,7 +480,7 @@ ad_proc -public im_admin_navbar { } {
     set parent_menu_sql "select menu_id from im_menus where name='Admin'"
     set parent_menu_id [db_string parent_admin_menu $parent_menu_sql]
 
-    return [im_sub_navbar $parent_menu_id]
+    return [im_sub_navbar $parent_menu_id $select_label]
 }
 
 

www/admin/menus/index.tcl

@@ -69,6 +69,7 @@ set table_header "
   <td width=20></td>
   <td width=20></td>
   <td width=20></td>
+  <td width=20></td>
   <td class=rowtitle>Package</td>
 "
 set main_sql_select ""
@@ -92,7 +93,7 @@ select
 ${main_sql_select}	m.*,
 	level,
 	(level-1) as indent_level,
-	(4-level) as colspan_level
+	(5-level) as colspan_level
 from
 	im_menus m
 start with