[freeside-commits] freeside/conf invoice_html, 1.11, 1.12 invoice_latex, 1.20, 1.21

[Jeff Finucane,420,,]

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

Modified Files:
	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.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- invoice_latex	4 Jun 2008 13:26:57 -0000	1.20
+++ invoice_latex	4 Jun 2008 17:59:10 -0000	1.21
@@ -157,16 +157,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]{
@@ -238,16 +240,26 @@
     $OUT .= '\hline';
     $OUT .= '\rule{0pt}{2.5ex}';
     $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & ';
-    $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';
+    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
+    $OUT .= '\makebox[2.0cm][l]{}& ';
+    $OUT .= '\makebox[2.0cm][l]{}& ';
+    $OUT .= '\makebox[2.0cm][l]{}& ';
+    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
+    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
+    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
     $OUT .= '\hline';
     $OUT .= '\endfirsthead';
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
     $OUT .= '\hline';
     $OUT .= '\rule{0pt}{2.5ex}';
     $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\multicolumn{6}{l}{\makebox[12.8cm][l]{\textbf{Description}}} & ';
-    $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';
+    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
+    $OUT .= '\makebox[2.0cm][l]{}& ';
+    $OUT .= '\makebox[2.0cm][l]{}& ';
+    $OUT .= '\makebox[2.0cm][l]{}& ';
+    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
+    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
+    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
     $OUT .= '\hline';
     $OUT .= '\endhead';
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
@@ -283,6 +295,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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- invoice_html	31 May 2008 14:49:03 -0000	1.11
+++ invoice_html	4 Jun 2008 17:59:07 -0000	1.12
@@ -117,7 +117,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">'.