X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=df4674b6a25f0644e22ce449bb7deed8b2a5cb1e;hb=acb1f7d01eb5300547fd8f105fe43ee88dd65e00;hp=b7f7b9789e58596ed086d00eee522f69a5564fd9;hpb=e3e8d316738336108b9b9af65d9adeb2ed085696;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index b7f7b9789..df4674b6a 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -114,15 +114,20 @@ $OUT .= '
Ref | '. - 'Description | '. - ( $unitprices - ? 'Unit Price | '. - 'Quantity | ' - : '' - ). - 'Amount | '. + '|
---|---|---|---|---|---|
Ref | '. + 'Description | '. + ( $unitprices + ? 'Unit Price | '. + 'Quantity | ' + : '' + ). + 'Amount | '; + } '|
'. - ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '. - ''. $line->{'description'}. ' | '. - ( $unitprices - ? ''. $line->{'unit_amount'}. ' | '. - ''. $line->{'quantity'}. ' | ' - : '' - ). - - ''. $line->{'amount'}. ' | '. - '|
'. + ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '. + ''. $line->{'description'}. ' | '. + ( $unitprices + ? ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | ' + : '' + ). + + ''. $line->{'amount'}. ' | '; + } + $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 .= ''; } } if ($section->{'posttotal'}) { @@ -203,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 .= '