- replaced invoice_template by template, invoices_(status|type) by

  cost_...

sql/oracle/intranet-categories.sql

@@ -53,10 +53,8 @@
 -- 400-409	Intranet Prior Experience
 -- 450-459	Intranet Employee Pipeline Status
 -- 500-599	Intranet Translation Subject Area
--- 600-699	Intranet Invoice Status
--- 700-799	Intranet Invoice Type
 -- 800-899	Intranet Invoice Payment Method
--- 900-999	Intranet Invoice Templates
+-- 900-999	Intranet Cost Templates
 -- 1000-1099	Intranet Payment Type (for im_payments)
 -- 1100-1199	Intranet Topic Type
 -- 1200-1299	Intranet Topic Status

sql/oracle/intranet-menus.sql

@@ -228,6 +228,7 @@ set escape \
 declare
 	-- Menu IDs
 	v_menu			integer;
+	v_top_menu		integer;
 	v_main_menu		integer;
 	v_home_menu		integer;
 	v_user_menu		integer;
@@ -295,20 +296,32 @@ begin
     from groups
     where group_name = 'Freelancers';
 
-    -- The "Main" menu: It's not displayed itself
-    -- but serves as the starting point for the entire
-    -- P/O menu hierarchy.
+    -- The "top" menu - the father of all menus.
+    -- It is not displayed itself and only serves
+    -- as a parent_menu_id from 'main' and 'project'.
+    v_top_menu := im_menu.new (
+	package_name =>	'intranet-core',
+	label =>	'top',
+	name =>		'Top Menu',
+	url =>		'/',
+	sort_order =>	10,
+	parent_menu_id => null
+    );
+
+    -- The "Main" menu: It's not displayed itself neither
+    -- but serves as the starting point for the main menu
+    -- hierarchy.
     v_main_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'main',
-	name =>		'Project/Open',
+	name =>		'Main Menu',
 	url =>		'/',
 	sort_order =>	10,
-	parent_menu_id => null
+	parent_menu_id => v_top_menu
     );
 
     v_home_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'home',
 	name =>		'Home',
 	url =>		'/intranet/index',
@@ -324,7 +337,7 @@ begin
     acs_permission.grant_permission(v_home_menu, v_freelancers, 'read');
 
     v_user_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users',
 	name =>		'Users',
 	url =>		'/intranet/users/',
@@ -339,7 +352,7 @@ begin
 
 
     v_project_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'projects',
 	name =>		'Projects',
 	url =>		'/intranet/projects/',
@@ -356,7 +369,7 @@ begin
 
 
     v_customer_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'customers',
 	name =>		'Clients',
 	url =>		'/intranet/customers/',
@@ -373,7 +386,7 @@ begin
 
 
 --    v_office_menu := im_menu.new (
---	package_name =>	'intranet',
+--	package_name =>	'intranet-core',
 --	label =>	'offices',
 --	name =>		'Offices',
 --	url =>		'/intranet/offices/',
@@ -390,7 +403,7 @@ begin
 
 
     v_admin_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin',
 	name =>		'Admin',
 	url =>		'/intranet/admin/',
@@ -409,7 +422,7 @@ begin
     -- but project_list is default in projects/index.tcl, so we can
     -- skip this here.
     v_project_standard_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'projects_standard',
 	name =>		'Summary',
 	url =>		'/intranet/projects/index',
@@ -426,7 +439,7 @@ begin
 
 
     v_project_status_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'projects_status',
 	name =>		'Status',
 	url =>		'/intranet/projects/index?view_name=project_status',
@@ -445,7 +458,7 @@ begin
     -- -----------------------------------------------------
 
     v_user_employees_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users_employees',
 	name =>		'Employees',
 	url =>		'/intranet/users/index?user_group_name=Employees',
@@ -460,7 +473,7 @@ begin
 
 
     v_user_customers_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users_customers',
 	name =>		'Clients',
 	url =>		'/intranet/users/index?user_group_name=Customers',
@@ -473,7 +486,7 @@ begin
 
 
     v_user_freelancers_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users_freelancers',
 	name =>		'Freelancers',
 	url =>		'/intranet/users/index?user_group_name=Freelancers',
@@ -488,7 +501,7 @@ begin
 
 
     v_user_all_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users_unassigned',
 	name =>		'Unassigned',
 	url =>		'/intranet/users/index?user_group_name=Unregistered\&view_name=user_community\&order_by=Creation',
@@ -500,7 +513,7 @@ begin
 
 
     v_user_all_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users_all',
 	name =>		'All Users',
 	url =>		'/intranet/users/index?user_group_name=All',
@@ -513,7 +526,7 @@ begin
 
 
     v_user_new_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'users_new',
 	name =>		'New User',
 	url =>		'/intranet/users/new',
@@ -531,7 +544,7 @@ begin
     -- -----------------------------------------------------
 
     v_admin_home_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin_home',
 	name =>		'Admin Home',
 	url =>		'/intranet/admin/',
@@ -541,7 +554,7 @@ begin
     acs_permission.grant_permission(v_admin_home_menu, v_admins, 'read');
 
     v_admin_profiles_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin_profiles',
 	name =>		'Profiles',
 	url =>		'/intranet/admin/profiles/',
@@ -551,7 +564,7 @@ begin
     acs_permission.grant_permission(v_admin_profiles_menu, v_admins, 'read');
 
     v_admin_menus_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin_menus',
 	name =>		'Menus',
 	url =>		'/intranet/admin/menus/',
@@ -561,7 +574,7 @@ begin
     acs_permission.grant_permission(v_admin_profiles_menu, v_admins, 'read');
 
     v_admin_matrix_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin_usermatrix',
 	name =>		'User Matrix',
 	url =>		'/intranet/admin/user_matrix/',
@@ -571,7 +584,7 @@ begin
     acs_permission.grant_permission(v_admin_matrix_menu, v_admins, 'read');
 
     v_admin_parameters_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin_parameters',
 	name =>		'Parameters',
 	url =>		'/intranet/admin/parameters/',
@@ -581,7 +594,7 @@ begin
     acs_permission.grant_permission(v_admin_parameters_menu, v_admins, 'read');
 
     v_admin_categories_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'admin_categories',
 	name =>		'Categories',
 	url =>		'/intranet/admin/categories/',
@@ -603,6 +616,7 @@ declare
 	-- Menu IDs
 	v_menu			integer;
 	v_project_menu		integer;
+	v_main_menu		integer;
 
 	-- Groups
 	v_employees		integer;
@@ -622,19 +636,24 @@ begin
     select group_id into v_customers from groups where group_name = 'Customers';
     select group_id into v_freelancers from groups where group_name = 'Freelancers';
 
+    select menu_id
+    into v_main_menu
+    from im_menus
+    where label='main';
+
     -- The "Project" menu: It's not displayed itself
     -- but serves as the starting point for submenus
     v_project_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'project',
 	name =>		'Project',
 	url =>		'/intranet/projects/view',
 	sort_order =>	10,
-	parent_menu_id => null
+	parent_menu_id => v_main_menu
     );
 
     v_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'project_standard',
 	name =>		'Summary',
 	url =>		'/intranet/projects/view?view_name=standard',
@@ -650,7 +669,7 @@ begin
     acs_permission.grant_permission(v_menu, v_freelancers, 'read');
 
     v_menu := im_menu.new (
-	package_name =>	'intranet',
+	package_name =>	'intranet-core',
 	label =>	'project_files',
 	name =>		'Files',
 	url =>		'/intranet/projects/view?view_name=files',

sql/oracle/intranet-permissions.sql

@@ -212,14 +212,7 @@ BEGIN
      -- only add the group if it didn't exist before...
      if n_groups = 0 then
 
-	-- call procedure defined in community-core.sql to get system user
-	v_system_user_id := 0;
-
 	v_group_id := im_profile.new(
-		context_id	=> null,
-		group_id	=> null,
-		creation_user   => v_system_user_id,
-		creation_ip	=> '0:0:0:0',
 		group_name	=> v_pretty_name,
 		profile_gif	=> v_profile_gif
 	);

sql/postgresql/po-core-dynviews.sql

@@ -126,7 +126,7 @@ insert into po_dynview_columns values (3207,32,'Received',
 'po-core::security::po_permission_p -privilege payment_read');
 
 insert into po_dynview_columns values (3209,32,'Invoice Amount',
-'$invoice_amount','',9,
+'$amount','',9,
 'po-core::security::po_permission_p  -privilege payment_read');
 
 insert into po_dynview_columns values (3211,32,'Amount Paid',
@@ -157,7 +157,7 @@ insert into po_dynview_columns values (3001,30,'Invoice #',
 'po-core::security::po_permission_p -privilege invoice_read');
 
 insert into po_dynview_columns values (3003,30,'Preview',
-'"<A HREF=/po-invoicing/invoices/view?invoice_id=$invoice_id${amp}render_template_id=$invoice_template_id>$invoice_nr</A>"',
+'"<A HREF=/po-invoicing/invoices/view?invoice_id=$invoice_id${amp}render_template_id=$template_id>$invoice_nr</A>"',
 '',2,'po-core::security::po_permission_p -privilege invoice_read');
 
 insert into po_dynview_columns values (3005,30,'Client',
@@ -169,7 +169,7 @@ insert into po_dynview_columns values (3007,30,'Due Date',
 '',4,'po-core::security::po_permission_p -privilege invoice_read');
 
 insert into po_dynview_columns values (3011,30,'Amount',
-'$invoice_amount_formatted $invoice_currency',
+'$amount_formatted $currency',
 '',6,'po-core::security::po_permission_p -privilege invoice_read');
 
 insert into po_dynview_columns values (3013,30,'Paid',
@@ -177,7 +177,7 @@ insert into po_dynview_columns values (3013,30,'Paid',
 '',7,'po-core::security::po_permission_p -privilege invoice_read');
 
 insert into po_dynview_columns values (3017,30,'Status',
-'[po_invoice_status_select "invoice_status.$invoice_id" $invoice_status_id]','',13,
+'[im_cost_status_select "cost_status.$invoice_id" $cost_status_id]','',13,
 'po-core::security::po_permission_p -privilege invoice_read');
 
 insert into po_dynview_columns values (3098,30,'Del',

tcl/intranet-backup-procs.tcl

@@ -2442,9 +2442,9 @@ ad_proc -public im_import_invoices { filename } {
         set customer_id [db_string customer "select customer_id from im_customers where customer_name=:customer_name" -default 0]
 	set creator_id [im_import_get_user $creator_email ""]
 	set customer_contact_id [im_import_get_user $customer_contact_email ""]
-	set invoice_template_id [im_import_get_category $invoice_template "Intranet Invoice Template" 0]
-	set invoice_status_id [im_import_get_category $invoice_status "Intranet Invoice Status" 0]
-	set invoice_type_id [im_import_get_category $invoice_type "Intranet Invoice Type" ""]
+	set template_id [im_import_get_category $template "Intranet Cost Template" 0]
+	set cost_status_id [im_import_get_category $cost_status "Intranet Cost Status" 0]
+	set cost_type_id [im_import_get_category $cost_type "Intranet Cost Type" ""]
 	set payment_method_id [im_import_get_category $payment_method "Intranet Invoice Payment Method" 0]
 
 	# Old style invoices - provider was Internal by default
@@ -2479,7 +2479,7 @@ SET
         invoice_date            = :invoice_date,
 	due_date		= :due_date,
 	invoice_currency	= :invoice_currency,
-        invoice_template_id     = :invoice_template_id,
+        invoice_template_id     = :template_id,
         invoice_status_id       = :invoice_status_id,
         invoice_type_id         = :invoice_type_id,
         payment_method_id       = :payment_method_id,

tcl/intranet-menu-procs.tcl

@@ -23,7 +23,7 @@ ad_proc -public im_menu_parent_options { {include_empty 0} } {
     ordered and indented according to hierarchy.
 } {
 
-    set start_menu_id [db_string start_menu_id "select menu_id from im_menus where label='main'" -default 0]
+    set start_menu_id [db_string start_menu_id "select menu_id from im_menus where label='top'" -default 0]
 
     set parent_options_sql "
 	select

tcl/intranet-project-procs.tcl

@@ -27,6 +27,22 @@ ad_library {
     @author frank.bergmann@project-open.com
 }
 
+# -----------------------------------------------------------
+# Constant Functions
+# -----------------------------------------------------------
+
+ad_proc -public im_project_type_unknown {} { return 85 }
+ad_proc -public im_project_type_other {} { return 86 }
+
+ad_proc -public im_project_status_quoting {} { return 74 }
+ad_proc -public im_project_status_open {} { return 76 }
+ad_proc -public im_project_status_declined {} { return 77 }
+ad_proc -public im_project_status_delivered {} { return 78 }
+ad_proc -public im_project_status_invoiced {} { return 79 }
+ad_proc -public im_project_status_closed {} { return 81 }
+ad_proc -public im_project_status_deleted {} { return 82 }
+ad_proc -public im_project_status_canceled {} { return 83 }
+
 
 # -----------------------------------------------------------
 # Project ::new, ::del and ::name procedures
@@ -201,17 +217,6 @@ begin
     }
 }
 
-
-ad_proc -public im_project_status_quoting {} { return 74 }
-ad_proc -public im_project_status_open {} { return 76 }
-ad_proc -public im_project_status_declined {} { return 77 }
-ad_proc -public im_project_status_delivered {} { return 78 }
-ad_proc -public im_project_status_invoiced {} { return 79 }
-ad_proc -public im_project_status_closed {} { return 81 }
-ad_proc -public im_project_status_deleted {} { return 82 }
-ad_proc -public im_project_status_canceled {} { return 83 }
-
-
 # -----------------------------------------------------------
 # Projects Business Logic
 # -----------------------------------------------------------

www/admin/menus/index.tcl

@@ -74,6 +74,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>\n"
 
 set main_sql_select ""
@@ -98,14 +99,14 @@ append table_header "
 # Main SQL: Extract the permissions for all Menus
 # ------------------------------------------------------
 
-set start_menu_id [db_string start_menu_id "select menu_id from im_menus where label='main'" -default 0]
+set start_menu_id [db_string start_menu_id "select menu_id from im_menus where label='top'" -default 0]
 
 set main_sql "
 select
 ${main_sql_select}	m.*,
 	level,
 	(level-1) as indent_level,
-	(5-level) as colspan_level
+	(6-level) as colspan_level
 from
 	im_menus m
 start with
@@ -136,7 +137,7 @@ db_foreach menus $main_sql {
 
     append table "
   <td colspan=$colspan_level>
-    <A href=$menu_url?menu_id=$menu_id>$name - $label</A>
+    <A href=$menu_url?menu_id=$menu_id>$name</A><br>$label
   </td>
   <td>$package_name</td>
 "

www/admin/menus/new.tcl

@@ -81,7 +81,7 @@ begin
         name            => :name,
         url             => :url,
         sort_order      => :sort_order,
-        parent_menu_id  => :parent_menu_id,
+        parent_menu_id  => :parent_menu_id
     );
 end;
 "
@@ -94,7 +94,7 @@ end;
 	        name            = :name,
 	        url             = :url,
 	        sort_order      = :sort_order,
-	        parent_menu_id  = :parent_menu_id,
+	        parent_menu_id  = :parent_menu_id
 	where
 		menu_id = :menu_id
 "

www/doc/categories.html

@@ -106,7 +106,7 @@ Invoicing
 Intranet Invoice Status
 Intranet Invoice Type
 Intranet Invoice Payment Method
-Intranet Invoice Templates
+Intranet Cost Templates
 Intranet Payment Type
 </pre>
 Forum