X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=dfd87c79b9c645c4a3014f30eefa82ad16c06f04;hb=df65690fe95f9a2ce769555bc82eb32a92f43bd6;hp=1d53683ad67011f5d63194c20f9290cf38e146e5;hpb=62b12e8b09608b7081ffd596be899fafb5c2403f;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index 1d53683ad..dfd87c79b 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -1,6 +1,18 @@ -
+
+
+
+ <%= $watermark %>
+
|
'. + $OUT .= ' | '. ' | ' . emt('Description') . ' | '. ( $unitprices - ? '' . emt('Unit Price') . ' | '. - '' . emt('Quantity') . ' | ' + ? '' . emt('Unit Price') . ' | '. + '' . emt('Quantity') . ' | ' : '' ). '' . emt('Amount') . ' | '; } @@ -147,26 +194,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'} || 0) ne $lastref ) { + # then it's a new package (not a continuation) + $class = 'invoice_desc'; + } + $OUT .= '
'; + $OUT .= ' | +'. $line->{'description'}. ' | '; + if ( $unitprices ) { + $OUT .= + ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | '; + } + $OUT .= ''. $line->{'amount'}. ' | '; } $OUT .= '
{'description'} || $multisection) {
+ if ($section->{'description'} || $multisection and !$section->{no_subtotal}) {
my $style = 'border-top: 3px solid #000000;'.
'border-bottom: 3px solid #000000;';
$OUT .=
@@ -263,4 +312,4 @@
><%= $footer %> - |