more voxline invoice formatting

diff --git a/conf/invoice_html b/conf/invoice_html
index d619c0a..f71f998 100644 (file)
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -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>'.

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 4ea3fe6..2a8c4bd 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -231,8 +231,8 @@ Terms: [@-- $terms --@]\\
 \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][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
 \makebox[2.0cm][r]{\textbf{Amount}} \\\r
 %\r
 \hline\r
@@ -245,8 +245,8 @@ Terms: [@-- $terms --@]\\
 \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][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
+\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
 \makebox[2.0cm][r]{\textbf{Amount}} \\\r
 \hline\r
 \endhead\r