summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeff <jeff>2008-06-04 18:40:54 +0000
committerjeff <jeff>2008-06-04 18:40:54 +0000
commit5e9fa0e297a01cd0d89361f8dc4ae6808627229c (patch)
tree7f3707fca538d431d320ef8d75c8e8de8be09a28
parent23e8af51c7be269079ba351931974ec0cb776e42 (diff)
more voxline invoice formatting
-rw-r--r--conf/invoice_html19
1 files changed, 17 insertions, 2 deletions
diff --git a/conf/invoice_html b/conf/invoice_html
index a3ab6c0c2..fe149b5f3 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -99,6 +99,12 @@
'<tr>'.
'<th align="center">Ref</th>'.
'<th align="left">Description</th>'.
+ <%= ( $unitprices
+ ? '<th align="left">Unit Price</th>'.
+ '<th align="left">Quantity</th>'
+ : ''
+ )
+ %>
'<th align="right">Amount</th>'.
'</tr>';
@@ -113,11 +119,19 @@
'<tr class="invoice_desc">'.
'<td align="center">'. $line->{'ref'}. '</td>'.
'<td align="left">'. $line->{'description'}. '</td>'.
+ ( $unitprices
+ ? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
+ '<td align="left">'. $line->{'quantity'}. '</td>'
+ : ''
+ ).
+
'<td align="right">'. $line->{'amount'}. '</td>'.
'</tr>'
;
if ( @{$line->{'ext_description'} } ) {
- $OUT .= '<tr class="invoice_extdesc"><td></td><td><table width="100%">';
+ $OUT .= '<tr class="invoice_extdesc"><td></td><td';
+ $OUT .= $unitprices ? ' colspan=3>' : '>';
+ $OUT .= '<table width="100%">';
foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
$OUT .=
'<tr class="invoice_extdesc">'.
@@ -165,7 +179,8 @@
$OUT .=
'<tr class="invoice_totaldesc">'.
qq(<td style="$style">&nbsp;</td>).
- qq(<td align="left" style="$style">).
+ qq(<td align="left" style="$style").
+ ( $unitprices ? ' colspan=3>' : '>' ).
$line->{'total_item'}. '</td>'.
qq(<td align="right" style="$style">).
$line->{'total_amount'}. '</td>'.