Commit a61f0063 authored by Frank Bergmann's avatar Frank Bergmann

- po34changes from ITSM

parent bdf71094
...@@ -134,7 +134,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy { ...@@ -134,7 +134,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
set task_table_rows " set task_table_rows "
<tr> <tr>
<td class=rowtitle align=middle>[im_gif help "Include in Invoice"] </td> <td class=rowtitle align=middle>[im_gif help "Include in Invoice"]</td>
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Task_Name "Task Name"]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Task_Name "Task Name"]</td>
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Material "Material"]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Material "Material"]</td>
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Planned_br_Units "Planned<br>Units"]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Planned_br_Units "Planned<br>Units"]</td>
...@@ -143,7 +143,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy { ...@@ -143,7 +143,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Reported_br_Units_in_br_Interval "Reported<br>Units in<br>Interval"]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Reported_br_Units_in_br_Interval "Reported<br>Units in<br>Interval"]</td>
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.All_Unbilled_Units "All<br>Unbilled<br>Units"]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.All_Unbilled_Units "All<br>Unbilled<br>Units"]</td>
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.UoM "UoM"]<br>[im_gif help "Unit of Measure"]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.UoM "UoM"]<br>[im_gif help "Unit of Measure"]</td>
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Type Type]</td> <!-- <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Type Type]</td> -->
<td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Status Status]</td> <td align=center class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Status Status]</td>
</tr> </tr>
" "
...@@ -181,7 +181,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy { ...@@ -181,7 +181,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
<td align=center><input type=radio name=invoice_hour_type value=interval $invoice_radio_disabled $interval_checked></td> <td align=center><input type=radio name=invoice_hour_type value=interval $invoice_radio_disabled $interval_checked></td>
<td align=center><input type=radio name=invoice_hour_type value=unbilled $invoice_radio_disabled $unbilled_checked></td> <td align=center><input type=radio name=invoice_hour_type value=unbilled $invoice_radio_disabled $unbilled_checked></td>
<td></td> <td></td>
<td></td> <!-- <td></td> -->
<td></td> <td></td>
</tr> </tr>
" "
...@@ -246,7 +246,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy { ...@@ -246,7 +246,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
set indent "" set indent ""
for {set i 0} {$i < $level} {incr i} { for {set i 0} {$i < $level} {incr i} {
append indent "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" append indent "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
} }
set task_checked "" set task_checked ""
...@@ -271,7 +271,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy { ...@@ -271,7 +271,7 @@ ad_proc im_timesheet_invoicing_project_hierarchy {
<td align=right>$hours_in_interval</td> <td align=right>$hours_in_interval</td>
<td align=right>$unbilled_hours</td> <td align=right>$unbilled_hours</td>
<td align=right>$uom_name</td> <td align=right>$uom_name</td>
<td>$project_type</td> <!-- <td>$project_type</td> -->
<td>$project_status</td> <td>$project_status</td>
</tr> </tr>
" "
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<form action=new-3 method=POST> <form action=new-3 method=POST>
<%= [export_form_vars company_id invoice_currency target_cost_type_id return_url select_project start_date end_date] %> <%= [export_form_vars company_id invoice_currency target_cost_type_id return_url select_project start_date end_date] %>
<table cellpadding=2 cellspacing=2 border=0> <table cellpadding=1 cellspacing=1 border=0>
@task_table_rows;noquote@ @task_table_rows;noquote@
<tr> <tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment