X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=df4674b6a25f0644e22ce449bb7deed8b2a5cb1e;hb=b5bb1a07a26d5666cb059b5299a6ca2883f2153a;hp=d5e24b812bb1427272ce544a91c163b96eb86552;hpb=f14d53ff0e570cc24395b9d7953ea427ac468de3;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index d5e24b812..df4674b6a 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -3,6 +3,8 @@ .invoice_header { font-size: 10pt } .invoice_headerright TH { border-top: 2px solid #000000; border-bottom: 2px solid #000000 } .invoice_headerright TD { font-size: 10pt; empty-cells: show } +.invoice_summary TH { border-bottom: 2px solid #000000 } +.invoice_summary TD { font-size: 10pt; empty-cells: show } .invoice_longtable table { cellspacing: none } .invoice_longtable TH { border-top: 2px solid #000000; border-bottom: 1px solid #000000; padding-left: none; padding-right: none; font-size: 10pt } .invoice_desc TD { border-top: 2px solid #000000; font-weight: bold; font-size: 10pt } @@ -40,7 +42,7 @@
'.
' '.
@@ -95,91 +97,103 @@
' '.
' |
';
- if ($section->{'description'}) {
- $OUT .=
- ' '. uc(substr($section->{'description'},0,1)). - ''. uc(substr($section->{'description'},1)). - ''. - ' '; - }else{ - $OUT .= - ' CHARGES'. - ' '; - } - $OUT .= ' |
';
+ if ($section->{'description'}) {
+ $OUT .=
+ ' '. uc(substr($section->{'description'},0,1)). + ''. uc(substr($section->{'description'},1)). + ''. + ' '; + }else{ + $OUT .= + ' CHARGES'. + ' '; + } + $OUT .= ' |
Ref | '. - 'Description | '. - ( $unitprices - ? 'Unit Price | '. - 'Quantity | ' - : '' - ). - 'Amount | '. - '||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
'. - ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '. - ''. $line->{'description'}. ' | '. - ( $unitprices - ? ''. $line->{'unit_amount'}. ' | '. - ''. $line->{'quantity'}. ' | ' - : '' - ). - - ''. $line->{'amount'}. ' | '. - '||||||||||||||||||||||||||||||||||||||||||
' : '>';
- $OUT .= '
';
}
- }
- if (scalar(@sections) > 1) {
- my $style = 'border-top: 3px solid #000000;'.
- 'border-bottom: 3px solid #000000;';
- $OUT .=
- ' | | ).
- qq(' : '>' ).
- $section->{'description'}. ' Total | '.
- qq().
- $section->{'subtotal'}. ' | '.
- ' | );
+ if ($section->{total_generator}) {
+ $OUT .= &{$section->{total_generator}}($section);
+ } else {
+ $OUT .= qq(' : '>' ).
+ $section->{'description'}. ' Total | '.
+ qq().
+ $section->{'subtotal'}. ' | ';
+ }
+ $OUT .= '';
$OUT .=
@@ -200,15 +214,18 @@
if ++$linenum == scalar(@total_items);
$OUT .=
- ' | | ).
- qq(' : '>' ).
- $line->{'total_item'}. ' | '.
- qq().
- $line->{'total_amount'}. ' | '.
- ' | ).
+ qq(' : '>' ).
+ $line->{'total_item'}. ' | '.
+ qq().
+ $line->{'total_amount'}. ' | ';
+ }
+ $OUT .= '-<%= $notes %> +<%= length($summary) + ? '' + : ( $smallernotes + ? ''.$notes.'' + : $notes + ) +%> - <%= $footer %> + ><%= $footer %> |