diff options
| author | ivan <ivan> | 2011-01-12 11:31:55 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-01-12 11:31:55 +0000 |
| commit | 977813079b2f81fc2d41edf425da53c61322aae4 (patch) | |
| tree | c4b3a224d3fbedf2edfd41fd778ca505a60a85e0 | |
| parent | 5bd39b3a93605d45b74b3cfcc447a1f64633ba7d (diff) | |
fix CDRs pushing typeset invoice off the right margin in some cases, RT#10962
| -rw-r--r-- | conf/invoice_latex | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/conf/invoice_latex b/conf/invoice_latex index 29a901df1..97401f9e1 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -180,9 +180,11 @@ % ...description...
\newcommand{\FSdesc}[5]{
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
- \multicolumn{4}{l}{\textbf{#2}} &
- \multicolumn{1}{l}{\textbf{#3}} &
- \multicolumn{1}{r}{\textbf{#4}} &
+ \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &
+[@-- $unitprices ? ' \multicolumn{1}{l}{\textbf{#3}} &'."\n".
+ ' \multicolumn{1}{r}{\textbf{#4}} &'."\n"
+ : ''
+--@]
\multicolumn{1}{r}{\textbf{\dollar #5}}\\
}
% ...extended description...
|