[freeside-commits] freeside/conf invoice_html, 1.6.2.4, 1.6.2.5 invoice_latex, 1.11.4.6, 1.11.4.7

[Jeff Finucane,420,,]

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

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

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.11.4.6
retrieving revision 1.11.4.7
diff -u -d -r1.11.4.6 -r1.11.4.7
--- invoice_latex	4 Jun 2008 17:58:16 -0000	1.11.4.6
+++ invoice_latex	4 Jun 2008 18:41:38 -0000	1.11.4.7
@@ -231,8 +231,8 @@
 \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][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&
 \makebox[2.0cm][r]{\textbf{Amount}} \\
 %
 \hline
@@ -245,8 +245,8 @@
 \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][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&
 \makebox[2.0cm][r]{\textbf{Amount}} \\
 \hline
 \endhead

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- invoice_html	4 Jun 2008 17:57:55 -0000	1.6.2.4
+++ invoice_html	4 Jun 2008 18:41:29 -0000	1.6.2.5
@@ -74,6 +74,12 @@
     <tr>
       <th align="center">Ref</th>
       <th align="left">Description</th>
+      <%= ( $unitprices 
+              ? '<th align="left">Unit Price</th>'.
+                '<th align="left">Quantity</th>'
+              : ''
+            )
+      %>
       <th align="right">Amount</th>
     </tr>
     <%=
@@ -83,11 +89,18 @@
           '<tr class="invoice_desc">'.
             '<td align="center">'. $line->{'ref'}. '</td>'.
             '<td align="left">'. $line->{'description'}. '</td>'.
+            ( $unitprices 
+                ? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
+                  '<td align="left">'. $line->{'quantity'}. '</td>'
+                : ''
+            ).
             '<td align="right">'. $line->{'amount'}. '</td>'.
           '</tr>'
         ;
         if ( @{$line->{'ext_description'} } ) {
-          $OUT .= '<tr class="invoice_extdesc"><td></td><td><table width="100%">';
+          $OUT .= '<tr class="invoice_extdesc"><td></td><td';
+          $OUT .= $unitprices ? ' colspan=3>' : '>';
+          $OUT .= '<table width="100%">';
           foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
             $OUT .=
               '<tr class="invoice_extdesc">'.
@@ -109,7 +122,8 @@
         $OUT .=
           '<tr class="invoice_totaldesc">'.
             qq(<td style="$style">&nbsp;</td>).
-            qq(<td align="left" style="$style">).
+            qq(<td align="left" style="$style").
+            ( $unitprices ? ' colspan=3>' : '>' ).
               $line->{'total_item'}. '</td>'.
             qq(<td align="right" style="$style">).
               $line->{'total_amount'}. '</td>'.