X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=5afbb7ad32c35362b5445d272fc6abfe2a5b0539;hb=3b54099d7b5532a411bb477006d78844c0597745;hp=9d97243e4d0b41e4b98bb0ed9888d4d3b9016ddf;hpb=162a742110ede26cbb904b1f38c6a99e4b692eef;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index 9d97243e4..5afbb7ad3 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -70,6 +70,16 @@ <%= foreach my $section ( @sections ) { + if ($section->{'pretotal'}) { + $OUT .= + '
'. + '

'. + uc(substr($section->{'pretotal'},0,1)). + ''. uc(substr($section->{'pretotal'},1)). + ''. + '

'. + '

'; + } $OUT .= ''. ''. ''. + ( $unitprices + ? ''. + '' + : '' + ). ''. ''; @@ -103,16 +118,26 @@ ''. ''. ''. + ( $unitprices + ? ''. + '' + : '' + ). + ''. '' ; - foreach my $ext_desc ( @{$line->{'ext_description'} } ) { - $OUT .= - ''. - ''. - ''. - ''. - '' + if ( @{$line->{'ext_description'} } ) { + $OUT .= '' : '>'; + $OUT .= '
'; if ($section->{'description'}) { $OUT .= @@ -89,6 +99,11 @@ '
RefDescriptionUnit PriceQuantityAmount
'. $line->{'ref'}. ''. $line->{'description'}. ''. $line->{'unit_amount'}. ''. $line->{'quantity'}. ''. $line->{'amount'}. '
- '. $ext_desc. '
'; + foreach my $ext_desc ( @{$line->{'ext_description'} } ) { + $OUT .= + ''. + ''. + '' + } + $OUT .= '
  '. $ext_desc. '
'; } } @@ -123,13 +148,23 @@ $OUT .= ''. qq( ). - qq(). + qq( colspan=3). $section->{'description'}. ' Total '. qq(). $section->{'subtotal'}. ''. '' ; } + + if ($section->{'posttotal'}) { + $OUT .= ''; + $OUT .= + '

'. $section->{'posttotal'}. + ''. + '

'; + $OUT .= ''; + } + } my $style = 'border-top: 3px solid #000000;'; @@ -143,7 +178,8 @@ $OUT .= ''. qq( ). - qq(). + qq(' : '>' ). $line->{'total_item'}. ''. qq(). $line->{'total_amount'}. ''.