X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=e2f16640ddd27ce11ffda2b729e7023be4bdc65b;hb=b57b46f7a4743346799dae9ae680152829889fc0;hp=a3ab6c0c2685878c9957f86672fa5f347c87f3b6;hpb=988ec48fea05902eb7ea22e43a44e86a36eee06a;p=freeside.git

diff --git a/conf/invoice_html b/conf/invoice_html
index a3ab6c0c2..e2f16640d 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -99,6 +99,11 @@
           '<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>';
 
@@ -113,15 +118,23 @@
             '<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">'.
-                  '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
+                  '<td align="left">&nbsp;&nbsp;'. $ext_desc. '</td>'.
                 '</tr>'
             }
             $OUT .= '</table></td><td></td></tr>';
@@ -135,7 +148,7 @@
           $OUT .=
             '<tr class="invoice_totaldesc">'.
               qq(<td style="$style">&nbsp;</td>).
-              qq(<td align="left" style="$style">).
+              qq(<td align="left" style="$style">).   #colspan=3???
                 $section->{'description'}. ' Total </td>'.
               qq(<td align="right" style="$style">).
                 $section->{'subtotal'}. '</td>'.
@@ -144,7 +157,7 @@
         }
 
         if ($section->{'posttotal'}) {
-          $OUT .= '<tr><td align="right" colspan=3>';
+          $OUT .= '<tr><td align="right" colspan=5>';
           $OUT .=
             '<p><font size="+1">'. $section->{'posttotal'}.
             '</font>'.
@@ -165,7 +178,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>'.