fix CDRs pushing typeset invoice off the right margin in some cases, RT#10962

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 29a901d..97401f9 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -180,9 +180,11 @@
 % ...description...\r
 \newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
-  \multicolumn{4}{l}{\textbf{#2}} &\r
-  \multicolumn{1}{l}{\textbf{#3}} &\r
-  \multicolumn{1}{r}{\textbf{#4}} &\r
+  \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &\r
+[@-- $unitprices ? '  \multicolumn{1}{l}{\textbf{#3}} &'."\n".\r
+                   '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"\r
+                 : ''\r
+--@]\r
   \multicolumn{1}{r}{\textbf{\dollar #5}}\\\r
 }\r
 % ...extended description...\r