diff options
| author | Mark Wells <mark@freeside.biz> | 2014-11-14 15:13:12 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2014-11-14 15:13:12 -0800 |
| commit | 014e2c547f63bcd283eac4d0210a7976ca5fcb90 (patch) | |
| tree | e0e4356664b8bdd7556f621c8fcae570bf0f3c2a /conf/invoice_latex | |
| parent | a07ca8e4ca980b88a4d6a8f85b4f72c459599e0a (diff) | |
show active discounts on invoices more cleanly, #31273
Diffstat (limited to 'conf/invoice_latex')
| -rw-r--r-- | conf/invoice_latex | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/conf/invoice_latex b/conf/invoice_latex index 6a5b53dd5..99d12d5c7 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -187,11 +187,11 @@ \newcommand{\FSdesc}[5]{
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
\multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
-[@-- $unitprices ? ' \multicolumn{1}{r}{\textbf{\dollar #3}} &'."\n".
+[@-- $unitprices ? ' \multicolumn{1}{r}{\textbf{#3}} &'."\n".
' \multicolumn{1}{r}{\textbf{#4}} &'."\n"
: ''
--@]
- \multicolumn{1}{r}{\textbf{\dollar #5}}\\
+ \multicolumn{1}{r}{\textbf{#5}}\\
}
% ...extended description...
\newcommand{\FSextdesc}[1]{
@@ -333,10 +333,17 @@ } else {
$OUT .= '\FSdesc'.
'{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
- '{' . $line->{'description'} . '}' .
- '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
- '{' . ( $unitprices ? $line->{'quantity'} : '' ) . '}' .
- '{' . $line->{'amount'} . "}${rowbreak}\n";
+ '{' . $line->{'description'} . '}' ;
+ if ( $unitprices and length($line->{'unit_amount'}) ) {
+ # then show the unit amount and quantity
+ $OUT .=
+ '{\\dollar' . $line->{'unit_amount'} . '}'.
+ '{' . $line->{'quantity'} . '}';
+ } else {
+ # leave those columns blank
+ $OUT .= '{}{}';
+ }
+ $OUT .= '{\\dollar' . $line->{'amount'} . "}${rowbreak}\n";
}
$lastref = $line->{'ref'};
|