voxline invoice formatting

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 19b351a..4ea3fe6 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -155,16 +155,18 @@
 \r
 \r
 % Commands for freeside description...\r
-\newcommand{\FSdesc}[3]{\r
+\newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
-  \multicolumn{6}{l}{\textbf{#2}} &\r
-  \multicolumn{1}{r}{\textbf{\dollar #3}}\\\r
+  \multicolumn{4}{l}{\textbf{#2}} &\r
+  \multicolumn{1}{l}{\textbf{#3}} &\r
+  \multicolumn{1}{r}{\textbf{#4}} &\r
+  \multicolumn{1}{r}{\textbf{\dollar #5}}\\\r
 }\r
 % ...extended description...\r
 \newcommand{\FSextdesc}[1]{\r
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
 %%  \multicolumn{2}{l}{\small{~-~#1}}\\\r
-  ~-~#1\\\r
+  ~~~#1\\\r
 }\r
 % ...and total line items.\r
 \newcommand{\FStotaldesc}[2]{\r
@@ -225,16 +227,27 @@ Terms: [@-- $terms --@]\\
 \hline\r
 \rule{0pt}{2.5ex}\r
 \makebox[1.4cm]{\textbf{Ref}} & \r
-\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & \r
-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
+\makebox[2.0cm][l]{\textbf{Description}}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{\textbf{[@-- !$unitprices ? '~~Unit Price' : '' --@]}}&\r
+\makebox[2.0cm]{\textbf{[@-- !$unitprices ? '~Quantity' : '' --@]}}&\r
+\makebox[2.0cm][r]{\textbf{Amount}} \\\r
+%\r
 \hline\r
 \endfirsthead\r
 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
 \hline\r
 \rule{0pt}{2.5ex}\r
 \makebox[1.4cm]{\textbf{Ref}} & \r
-\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & \r
-\makebox[2.5cm][r]{\textbf{Amount}} \\\r
+\makebox[2.0cm][l]{\textbf{Description}}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{}&\r
+\makebox[2.0cm][l]{\textbf{[@-- !$unitprices ? '~~Unit Price' : '' --@]}}&\r
+\makebox[2.0cm]{\textbf{[@-- !$unitprices ? '~Quantity' : '' --@]}}&\r
+\makebox[2.0cm][r]{\textbf{Amount}} \\\r
 \hline\r
 \endhead\r
 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
@@ -260,6 +273,8 @@ Terms: [@-- $terms --@]\\
 \r
     $OUT .= "\\hline\n";\r
     $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .\r
+            '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.\r
+            '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .\r
             '{' . $line->{'amount'} . "}${rowbreak}\n";\r
 \r
     foreach my $ext_desc (@$ext_description) {\r