[freeside-commits] freeside/conf invoice_latex,1.43,1.44

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv10653

Modified Files:
	invoice_latex 
Log Message:
fix CDRs pushing typeset invoice off the right margin in some cases, RT#10962

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -d -r1.43 -r1.44
--- invoice_latex	23 Jun 2010 08:37:46 -0000	1.43
+++ invoice_latex	12 Jan 2011 11:31:55 -0000	1.44
@@ -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...