show active discounts on invoices more cleanly, #31273

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 6a5b53d..99d12d5 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -187,11 +187,11 @@
 \newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
   \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &\r
-[@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{\dollar #3}} &'."\n".\r
+[@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{#3}} &'."\n".\r
                    '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"\r
                  : ''\r
 --@]\r
-  \multicolumn{1}{r}{\textbf{\dollar #5}}\\\r
+  \multicolumn{1}{r}{\textbf{#5}}\\\r
 }\r
 % ...extended description...\r
 \newcommand{\FSextdesc}[1]{\r
@@ -333,10 +333,17 @@
         } else {\r
           $OUT .= '\FSdesc'.\r
                   '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.\r
-                  '{' . $line->{'description'} . '}' .\r
-                  '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.\r
-                  '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .\r
-                  '{' . $line->{'amount'} . "}${rowbreak}\n";\r
+                  '{' . $line->{'description'} . '}' ;\r
+          if ( $unitprices and length($line->{'unit_amount'}) ) {\r
+            # then show the unit amount and quantity\r
+            $OUT .= \r
+                '{\\dollar' . $line->{'unit_amount'} . '}'.\r
+                '{'         . $line->{'quantity'}    . '}';\r
+          } else {\r
+            # leave those columns blank\r
+            $OUT .= '{}{}';\r
+          }\r
+          $OUT .= '{\\dollar' . $line->{'amount'} . "}${rowbreak}\n";\r
         }\r
         $lastref = $line->{'ref'};\r
 \r