fix very obsolote eval callbacks for part_pkg.setup and recur, RT#14372

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 29a901d..10f30cf 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -125,7 +125,7 @@
   \ifthenelse{\equal{\thepage}{1}}\r
   { % First page\r
     \begin{tabular}{ccc}\r
-    Invoice date & Invoice \#& Customer\#\\\r
+    Invoice date & Invoice \#& Customer \#\\\r
     \vspace{0.2cm}\r
     \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline\r
     \rule{0pt}{5ex} &~~ \huge{\textsc{[@-- $notice_name || 'Invoice' --@]}} & \\\r
@@ -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
@@ -227,7 +229,7 @@
   }\r
 --@]\r
 \begin{flushright}\r
-Terms: [@-- $terms --@]\\\r
+[@-- $terms ? "Terms: $terms" : '' --@]\\\r
 [@-- $po_line --@]\\\r
 \end{flushright}\r
 \end{minipage}}\r