projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dash removal
[freeside.git]
/
conf
/
invoice_html
diff --git
a/conf/invoice_html
b/conf/invoice_html
index
fe149b5
..
5afbb7a
100644
(file)
--- a/
conf/invoice_html
+++ b/
conf/invoice_html
@@
-99,12
+99,11
@@
'<tr>'.
'<th align="center">Ref</th>'.
'<th align="left">Description</th>'.
'<tr>'.
'<th align="center">Ref</th>'.
'<th align="left">Description</th>'.
- <%= ( $unitprices
- ? '<th align="left">Unit Price</th>'.
- '<th align="left">Quantity</th>'
- : ''
- )
- %>
+ ( $unitprices
+ ? '<th align="left">Unit Price</th>'.
+ '<th align="left">Quantity</th>'
+ : ''
+ ).
'<th align="right">Amount</th>'.
'</tr>';
'<th align="right">Amount</th>'.
'</tr>';
@@
-135,7
+134,7
@@
foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
$OUT .=
'<tr class="invoice_extdesc">'.
foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
$OUT .=
'<tr class="invoice_extdesc">'.
- '<td align="left">
-
'. $ext_desc. '</td>'.
+ '<td align="left">
'. $ext_desc. '</td>'.
'</tr>'
}
$OUT .= '</table></td><td></td></tr>';
'</tr>'
}
$OUT .= '</table></td><td></td></tr>';
@@
-149,7
+148,7
@@
$OUT .=
'<tr class="invoice_totaldesc">'.
qq(<td style="$style"> </td>).
$OUT .=
'<tr class="invoice_totaldesc">'.
qq(<td style="$style"> </td>).
- qq(<td align="left" style="$style">).
+ qq(<td align="left" style="$style">
colspan=3
).
$section->{'description'}. ' Total </td>'.
qq(<td align="right" style="$style">).
$section->{'subtotal'}. '</td>'.
$section->{'description'}. ' Total </td>'.
qq(<td align="right" style="$style">).
$section->{'subtotal'}. '</td>'.
@@
-158,7
+157,7
@@
}
if ($section->{'posttotal'}) {
}
if ($section->{'posttotal'}) {
- $OUT .= '<tr><td align="right" colspan=
3
>';
+ $OUT .= '<tr><td align="right" colspan=
5
>';
$OUT .=
'<p><font size="+1">'. $section->{'posttotal'}.
'</font>'.
$OUT .=
'<p><font size="+1">'. $section->{'posttotal'}.
'</font>'.