X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=bd99899e0b7b5b686e82e6201e7970f46dfd4065;hb=8dd41f364aaba88969dfd0908feb22709025e7f6;hp=fc553d5d53e81253df6621053398744d2ccd5c66;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index fc553d5d5..bd99899e0 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; font-size: 12pt }
@@ -23,26 +24,26 @@
|
Description | '. - ( $unitprices - ? 'Unit Price | '. - 'Quantity | ' - : '' - ). - 'Amount | '; + $OUT .= '' . emt('Ref') . ' | '. + '' . emt('Description') . ' | '. + ( $unitprices + ? '' . emt('Unit Price') . ' | '. + '' . emt('Quantity') . ' | ' + : '' ). + '' . emt('Amount') . ' | '; } $OUT .= ''; @@ -152,23 +161,28 @@ ) } @detail_items ) { - $OUT .= - '
---|---|---|---|---|
'. - ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '. - ''. $line->{'description'}. ' | '. - ( $unitprices - ? ''. $line->{'unit_amount'}. ' | '. - ''. $line->{'quantity'}. ' | ' - : '' - ). - - ''. $line->{'amount'}. ' | '; + my $class = 'invoice_desc_more'; + if ( $line->{'ref'} and $line->{'ref'} ne $lastref ) { + # then it's a new package (not a continuation) + $class = 'invoice_desc'; + } + $OUT .= '
'; + if ( $line->{'ref'} ne $lastref ) { + $OUT .= $line->{'ref'}; + } + $OUT .= ' | +'. $line->{'description'}. ' | '; + if ( $unitprices ) { + $OUT .= + ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | '; + } + $OUT .= ''. $line->{'amount'}. ' | '; } $OUT .= '' : '>' ). - $section->{'description'}. ' Total | '. + $section->{'description'}. ' ' . emt('Total') . ''. qq(). $section->{'subtotal'}. ' | '; }