- Added outline_nr save capabilities

www/invoices/new-3.tcl

@@ -55,6 +55,7 @@ if {"" == $return_url} {set return_url [im_url_with_query] }
 set todays_date [db_string get_today "select to_char(now(), :date_format)"]
 set page_focus "im_header_form.keywords"
 set view_name "invoice_tasks"
+set outline_number_enabled_p [im_column_exists im_invoice_items item_outline_number]
 
 set bgcolor(0) " class=roweven"
 set bgcolor(1) " class=rowodd"
@@ -224,11 +225,14 @@ set due_date [db_string get_due_date "select to_date(to_char(sysdate,'YYYY-MM-DD
 # ---------------------------------------------------------------
 
 # start formatting the list of sums with the header...
-set task_sum_html "
-        <tr align=center> 
-          <td class=rowtitle>[_ intranet-timesheet2-invoices.Order]</td>
-          <td class=rowtitle>[_ intranet-timesheet2-invoices.Description]</td>
-"
+set task_sum_html "<tr align=center>\n"
+append task_sum_html "<td class=rowtitle>[_ intranet-timesheet2-invoices.Order]</td>\n"
+
+if {$outline_number_enabled_p} {
+    append task_sum_html "<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Outline Outline]</td>\n"
+}
+
+append task_sum_html "<td class=rowtitle>[_ intranet-timesheet2-invoices.Description]</td>\n"
 if {$material_enabled_p} {
     append task_sum_html "<td class=rowtitle>[lang::message::lookup "" intranet-invoices.Material "Material"]</td>"
 }
@@ -351,6 +355,7 @@ if {$aggregate_tasks_p} {
 		t.planned_units as planned_sum,
 		t.billable_units as billable_sum,
 		t.task_id,
+		p.project_nr as outline_nr,
 		CASE WHEN t.uom_id = 321 THEN
 			(select sum(h.days) from im_hours h where h.project_id = p.project_id)
 		ELSE
@@ -466,6 +471,7 @@ order by
 		s.company_id,
 		s.project_id,
 		s.task_id,
+                s.outline_nr,
 		p.project_name,
 		p.project_path,
 		p.project_path as project_short_name,
@@ -477,9 +483,6 @@ order by
 		p.project_id
     "
 
-
-# ad_return_complaint 1 [im_ad_hoc_query -format html $task_sum_sql]
-
     set ctr 1
     set old_project_id 0
     set colspan 6
@@ -548,7 +551,13 @@ order by
 	<tr $bgcolor([expr {$ctr % 2}])> 
 	  <td>
 	    <input type=text name=item_sort_order.$ctr size=2 value='$ctr'>
-	  </td>
+	  </td>\n"
+
+       if {$outline_number_enabled_p} {
+           append task_sum_html "<td><input type=text name=item_outline_number.$ctr size=10 value='$outline_nr'></td>\n"
+       }
+
+	append task_sum_html "
 	  <td>
 	    <input type=text name=item_name.$ctr size=40 value='[ns_quotehtml $task_name]'>
 	    <input type=hidden name=item_task_id.$ctr value='$task_id'>

www/invoices/new-4.tcl

@@ -34,6 +34,7 @@ ad_page_contract {
     tax:float
     {note ""}
     item_sort_order:array
+    item_outline_number:array
     item_name:array
     item_units:float,array
     item_uom_id:integer,array
@@ -53,6 +54,7 @@ ad_page_contract {
 
 set user_id [auth::require_login]
 set current_user_id $user_id
+set outline_number_enabled_p [im_column_exists im_invoice_items item_outline_number]
 
 if {![im_permission $user_id add_invoices]} {
     ad_return_complaint 1 "<li>[_ intranet-timesheet2-invoices.lt_You_dont_have_suffici]"
@@ -203,6 +205,7 @@ foreach nr $item_list {
     set rate $item_rate($nr)
     set currency $item_currency($nr)
     set sort_order $item_sort_order($nr)
+    set outline_number $item_outline_number($nr)
     set task_id $item_task_id($nr)  
     ns_log Notice "item($nr, $name, $units, $uom_id, $project_id, $rate, $currency, $task_id)"
 
@@ -227,8 +230,12 @@ foreach nr $item_list {
 		:material_id,
 		null, '', :task_id
 	)"
-
         db_dml insert_invoice_items $insert_invoice_items_sql
+
+	if {$outline_number_enabled_p} {
+	    db_dml outline "update im_invoice_items set item_outline_number = :outline_number where item_id = :item_id"
+	}
+
     }
 }