summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormark <mark>2011-10-01 02:25:05 +0000
committermark <mark>2011-10-01 02:25:05 +0000
commitcd3ed01671d5e1f9332c494abbf4bb110aabe1e3 (patch)
tree22c4ecf0dfa716204a1e6acbbb79e24797e82e1d /conf
parenta85bf2b444454d120a334d6ae11a0e981bd75db9 (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 1d53683..567385b 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 37f59d2..772c2eb 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 {