From: ivan <ivan>
Date: Wed, 12 Jan 2011 11:31:56 +0000 (+0000)
Subject: fix CDRs pushing typeset invoice off the right margin in some cases, RT#10962
X-Git-Tag: freeside_2_1_2~164
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=067381c4bb3351282af4aa74c7c740b8d092f2d2;p=freeside.git

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 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...