summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormark <mark>2011-10-01 02:25:15 +0000
committermark <mark>2011-10-01 02:25:15 +0000
commitef6e75c42256463303650203628803f5e781f3db (patch)
treedb7f7df32d5d4eb956a68ef339d34849f2527cab /conf
parent7515198c4da1c80ab00628e1f05cb498f916fead (diff)
show available term discounts on invoice, #14210
Diffstat (limited to 'conf')
-rw-r--r--conf/invoice_html2
-rw-r--r--conf/invoice_latex2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/invoice_html b/conf/invoice_html
index 1d53683ad..567385b06 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -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 .=
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 37f59d2ee..772c2eb95 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -272,7 +272,7 @@
$OUT .= '\endfoot';
$OUT .= '\hline';
- if (scalar(@sections) > 1) {
+ if (scalar(@sections) > 1 and !$section->{no_subtotal}) {
if ($section->{total_generator}) {
$OUT .= &{$section->{total_generator}}($section);
} else {