- Report: Timesheet Hierarchy & Finance:

  - Added project & department options
  - Extended user select with -limit_to_cc_id option

www/timesheet-finance.adp

@@ -8,7 +8,7 @@
 
 
 <form>
-<%= [export_vars -form {opened_projects project_id}] %>
+<%= [export_vars -form {opened_projects}] %>
 
 <table border="0" cellspacing="1" cellpadding="1">
 <tr valign="top"><td>
@@ -29,13 +29,25 @@
 	<tr>
 	  <td class=form-label>Customer</td>
 	  <td class=form-widget>
-	    <%= [im_company_select customer_id $customer_id] %>
+	    <%= [im_company_select -include_empty_name "All" customer_id $customer_id] %>
+	  </td>
+	</tr>
+	<tr>
+	  <td class=form-label>Project</td>
+	  <td class=form-widget>
+	    <%= [im_project_select -include_empty_p 1 -include_empty_name "All" project_id $project_id] %>
+	  </td>
+	</tr>
+	<tr>
+	  <td class=form-label>Department</td>
+	  <td class=form-widget>
+	    <%= [im_cost_center_select department_id $department_id] %>
 	  </td>
 	</tr>
 	<tr>
 	  <td class=form-label>User</td>
 	  <td class=form-widget>
-	    <%= [im_employee_select_multiple employee_id $employee_id 6 multiple] %>
+	    <%= [im_employee_select_multiple -limit_to_cc_id $department_id employee_id $employee_id 6 multiple] %>
 	  </td>
 	</tr>
 	<tr>

www/timesheet-finance.tcl

@@ -14,6 +14,7 @@ ad_page_contract {
     { output_format "html" }
     { project_id:integer 0}
     { customer_id:integer 0}
+    { department_id:integer 0}
     { employee_id:multiple 0}
     { opened_projects:multiple "" }
     { display_fields:multiple "cost_invoices_cache cost_quotes_cache cost_bills_cache cost_expense_logged_cache cost_timesheet_logged_cache direct_hours reported_hours_cache" }