X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=cd348274fd94f372fd369e2af926e0ec0fac863d;hb=cc9fc5ea4477bd50cb67f8aae1482bb7606761db;hp=1d53683ad67011f5d63194c20f9290cf38e146e5;hpb=9c866ccad0f187f29d21f12b93f15f2787aa9843;p=freeside.git
diff --git a/conf/invoice_html b/conf/invoice_html
index 1d53683ad..cd348274f 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -132,8 +132,8 @@
$OUT .= '
' . emt('Ref') . ' | '.
'' . emt('Description') . ' | '.
( $unitprices
- ? '' . emt('Unit Price') . ' | '.
- '' . emt('Quantity') . ' | '
+ ? '' . emt('Unit Price') . ' | '.
+ '' . emt('Quantity') . ' | '
: '' ).
'' . emt('Amount') . ' | ';
}
@@ -158,8 +158,8 @@
( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ''.
''. $line->{'description'}. ' | '.
( $unitprices
- ? ''. $line->{'unit_amount'}. ' | '.
- ''. $line->{'quantity'}. ' | '
+ ? ''. $line->{'unit_amount'}. ' | '.
+ ''. $line->{'quantity'}. ' | '
: ''
).
@@ -191,7 +191,7 @@
}
- if ($section->{'description'} || $multisection) {
+ if ($section->{'description'} || $multisection and !$section->{no_subtotal}) {
my $style = 'border-top: 3px solid #000000;'.
'border-bottom: 3px solid #000000;';
$OUT .=