[freeside-commits] freeside/conf invoice_html, 1.6.2.3, 1.6.2.4 invoice_latex, 1.11.4.5, 1.11.4.6

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	invoice_html invoice_latex 
Log Message:
voxline invoice formatting

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.11.4.5
retrieving revision 1.11.4.6
diff -u -d -r1.11.4.5 -r1.11.4.6
--- invoice_latex	4 Jun 2008 13:27:43 -0000	1.11.4.5
+++ invoice_latex	4 Jun 2008 17:58:16 -0000	1.11.4.6
@@ -155,16 +155,18 @@
 
 
 % Commands for freeside description...
-\newcommand{\FSdesc}[3]{
+\newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
-  \multicolumn{6}{l}{\textbf{#2}} &
-  \multicolumn{1}{r}{\textbf{\dollar #3}}\\
+  \multicolumn{4}{l}{\textbf{#2}} &
+  \multicolumn{1}{l}{\textbf{#3}} &
+  \multicolumn{1}{r}{\textbf{#4}} &
+  \multicolumn{1}{r}{\textbf{\dollar #5}}\\
 }
 % ...extended description...
 \newcommand{\FSextdesc}[1]{
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
 %%  \multicolumn{2}{l}{\small{~-~#1}}\\
-  ~-~#1\\
+  ~~~#1\\
 }
 % ...and total line items.
 \newcommand{\FStotaldesc}[2]{
@@ -225,16 +227,27 @@
 \hline
 \rule{0pt}{2.5ex}
 \makebox[1.4cm]{\textbf{Ref}} & 
-\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & 
-\makebox[2.5cm][r]{\textbf{Amount}} \\
+\makebox[2.0cm][l]{\textbf{Description}}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{\textbf{[@-- !$unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- !$unitprices ? '~Quantity' : '' --@]}}&
+\makebox[2.0cm][r]{\textbf{Amount}} \\
+%
 \hline
 \endfirsthead
 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\
 \hline
 \rule{0pt}{2.5ex}
 \makebox[1.4cm]{\textbf{Ref}} & 
-\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & 
-\makebox[2.5cm][r]{\textbf{Amount}} \\
+\makebox[2.0cm][l]{\textbf{Description}}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{}&
+\makebox[2.0cm][l]{\textbf{[@-- !$unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- !$unitprices ? '~Quantity' : '' --@]}}&
+\makebox[2.0cm][r]{\textbf{Amount}} \\
 \hline
 \endhead
 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\
@@ -260,6 +273,8 @@
 
     $OUT .= "\\hline\n";
     $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
+            '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
+            '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .
             '{' . $line->{'amount'} . "}${rowbreak}\n";
 
     foreach my $ext_desc (@$ext_description) {

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- invoice_html	19 May 2008 04:07:43 -0000	1.6.2.3
+++ invoice_html	4 Jun 2008 17:57:55 -0000	1.6.2.4
@@ -87,7 +87,7 @@
           '</tr>'
         ;
         if ( @{$line->{'ext_description'} } ) {
-          $OUT .= '<tr class="invoice_extdesc"><td></td><td><table>';
+          $OUT .= '<tr class="invoice_extdesc"><td></td><td><table width="100%">';
           foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
             $OUT .=
               '<tr class="invoice_extdesc">'.