Commit e0f4cdb0 authored by Frank Bergmann's avatar Frank Bergmann

-- slightly better layout

-- fixed issue w/ customer_contact_id
parent 2af364f3
......@@ -14,7 +14,7 @@
@include_task_html;noquote@
<!-- Invoice Data and Receipient Tables -->
<table cellpadding=0 cellspacing=0 bordercolor=#6699CC border=0 width=100%>
<table cellpadding=0 cellspacing=0 bordercolor=#6699CC border=0>
<tr valign=top>
<td>
......@@ -79,8 +79,7 @@
</td>
<td></td>
<td align=right>
<td align=left>
<table border=0 cellspacing=2 cellpadding=0 >
<tr>
<td align=center valign=top class=rowtitle colspan=2>
......@@ -117,9 +116,9 @@
</tr>
</table>
<br/><br/>
<!-- the list of tasks (invoicable items) -->
<div align=right>
<div align=left>
<table cellpadding=2 cellspacing=2 border=0>
<%= [im_timesheet_invoicing_project_hierarchy \
-select_project $select_project \
......@@ -136,7 +135,7 @@
<!-- the list of task sums, distinguised by type and UOM -->
<table width=100%>
<tr>
<td align=right><table border=0 cellspacing=2 cellpadding=1>
<td align=left><table border=0 cellspacing=2 cellpadding=1>
@task_sum_html;noquote@
......
......@@ -144,6 +144,8 @@ set contact_ids [db_list contact_ids "
if {[llength $contact_ids] > 0} {
set company_contact_id [lindex $contact_ids 0]
} else {
set company_contact_id ""
}
if {"" == $company_contact_id} { set company_contact_id $accounting_contact_id }
if {"" == $company_contact_id} { set company_contact_id $primary_contact_id }
......@@ -245,7 +247,9 @@ append task_sum_html "
#
set price_colspan 11
set reference_price_html "
<tr><td align=middle class=rowtitle colspan=$price_colspan>[_ intranet-timesheet2-invoices.Reference_Prices]</td></tr>
<tr>
<td align=middle class=rowtitle colspan=$price_colspan>[_ intranet-timesheet2-invoices.Reference_Prices]</td>
</tr>
<tr>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Company]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.UoM]</td>
......
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