X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=conf%2Finvoice_html;h=cd348274fd94f372fd369e2af926e0ec0fac863d;hb=54a357b171aa44f9399b4c146acd2afd3b686075;hp=2073d7ff40b8205401f24f70db832c0c9d0266a5;hpb=b41cc79f66f4e701e0f6d973758529ebff702bf1;p=freeside.git
diff --git a/conf/invoice_html b/conf/invoice_html
index 2073d7ff4..cd348274f 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -11,6 +11,7 @@
.invoice_desc_more TD { font-weight: bold; font-size: 10pt }
.invoice_extdesc TD { font-size: 8pt }
.invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
+.allcaps { text-transform:uppercase }
@@ -23,26 +24,26 @@
' if ( $notfirst || $section->{'pretotal'} && !$summary );
$OUT .= '';
- if ($section->{'description'}) {
- $OUT .=
- ' '. uc(substr($section->{'description'},0,1)).
- ''. uc(substr($section->{'description'},1)).
+ my $sectionhead = $section->{'description'} || emt('Charges');
+ $OUT .=
+ ''. substr($sectionhead,0,1).
+ ''. substr($sectionhead,1).
''.
- ' ';
- }else{
- $OUT .=
- ' CHARGES'.
- ' ';
- }
- $OUT .= ' | ';
+ ''.
+ ' |
';
$OUT .=
''.
@@ -125,14 +129,13 @@
$OUT .= $header;
$columncount = scalar(my @array = split /<\/th>Description | '.
- ( $unitprices
- ? 'Unit Price | '.
- 'Quantity | '
- : ''
- ).
- 'Amount | ';
+ $OUT .= '' . emt('Ref') . ' | '.
+ '' . emt('Description') . ' | '.
+ ( $unitprices
+ ? '' . emt('Unit Price') . ' | '.
+ '' . emt('Quantity') . ' | '
+ : '' ).
+ '' . emt('Amount') . ' | ';
}
$OUT .= '';
@@ -155,8 +158,8 @@
( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ''.
''. $line->{'description'}. ' | '.
( $unitprices
- ? ''. $line->{'unit_amount'}. ' | '.
- ''. $line->{'quantity'}. ' | '
+ ? ''. $line->{'unit_amount'}. ' | '.
+ ''. $line->{'quantity'}. ' | '
: ''
).
@@ -188,7 +191,7 @@
}
- if ($section->{'description'} || $multisection) {
+ if ($section->{'description'} || $multisection and !$section->{no_subtotal}) {
my $style = 'border-top: 3px solid #000000;'.
'border-bottom: 3px solid #000000;';
$OUT .=
@@ -199,7 +202,7 @@
} else {
$OUT .= qq(' : '>' ).
- $section->{'description'}. ' Total | '.
+ $section->{'description'}. ' ' . emt('Total') . ''.
qq().
$section->{'subtotal'}. ' | ';
}