X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=conf%2Finvoice_html;h=fc553d5d53e81253df6621053398744d2ccd5c66;hp=026bc8b6b6fdea420bbfc630d2c664887eb23ccc;hb=bc03d12fffd22153b5035bc021450387bacc17b8;hpb=4c951501b14bf459fa039db9ef093cfea9e37db3

diff --git a/conf/invoice_html b/conf/invoice_html
index 026bc8b6b..fc553d5d5 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -42,7 +42,7 @@
           <tr>
             <th>&nbsp;</th>
             <th colspan=3 align="center">
-              <FONT SIZE="+3">I</FONT><FONT SIZE="+2">NVOICE</FONT>
+              <FONT SIZE="+3"><%= $notice_name ? substr($notice_name, 0, 1) : 'I' %></FONT><FONT SIZE="+2"><%= $notice_name ? uc(substr($notice_name, 1)) : 'NVOICE' %></FONT>
             </th>
             <th>&nbsp;</th>
           </tr>
@@ -78,6 +78,14 @@
                        : ''
       %>
       <td align="right">
+    <%=
+	if($barcode_cid) {
+	    $OUT .= qq! <img src="cid:$barcode_cid"><br> !;
+	}
+	elsif($barcode_img) {
+	    $OUT .= qq! <img src="cust_bill-barcode.cgi?invnum=$invnum;template=$template"><br> !;
+	}
+    %>
         Terms: <%= $terms %><BR>
         <%= $po_line %>
       </td>
@@ -86,8 +94,11 @@
   </table>
   <%= $summary %>
   <%=
+      my $notfirst = 0;
+      my $columncount = $unitprices ? 5 : 3;
       foreach my $section ( grep { !$summary || $_->{description} ne $finance_section } @sections ) {
         if ($section->{'pretotal'} && !$summary) {
+          $OUT .= '</table>' if $notfirst;
           $OUT .=
             '<table width="100%"><tr><td>'.
             '<p align="right"><b><font size="+1">'.
@@ -95,9 +106,10 @@
             '</font><font size="+0">'. uc(substr($section->{'pretotal'},1)).
             '</font></b>'.
             '<p>'.
-            '</td></tr></table>';
+            '</td></tr>';
         }
         unless ($section->{'summarized'}) {
+          $OUT .= '</table>' if ( $notfirst || $section->{'pretotal'} && !$summary );
           $OUT .= '<table><tr><td>';
           if ($section->{'description'}) {
             $OUT .=
@@ -114,16 +126,23 @@
 
           $OUT .=
             '<table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">'.
-            '<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>';
+            '<tr>';
+
+          if ($section->{header_generator}) {
+            my $header = &{$section->{header_generator}}();
+            $OUT .= $header;
+            $columncount = scalar(my @array = split /<\/th><th/i, $header);
+          } else {
+            $OUT .=  '<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>';
+          }
+            $OUT .= '</tr>';
 
           my $lastref = 0;
           foreach my $line (
@@ -134,57 +153,69 @@
             @detail_items )
           {
             $OUT .=
-              '<tr class="invoice_desc'.
-                ( ($line->{'ref'} && $line->{'ref'} ne $lastref) ? '' : '_more' ).
-                '">'.
-                '<td align="center">'. 
-                ( $line->{'ref'} ne $lastref ? $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>'
-            ;
+              '<tr class="invoice_desc';
+            if ( $section->{description_generator} ) {
+              $OUT .= &{$section->{description_generator}}($line);
+            } else {
+              $OUT .=  ( ($line->{'ref'} && $line->{'ref'} ne $lastref) ? '' : '_more' ).
+                       '">'.
+                       '<td align="center">'. 
+                       ( $line->{'ref'} ne $lastref ? $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>';
+            }
+            $OUT .= '</tr>';
             $lastref = $line->{'ref'};
             if ( @{$line->{'ext_description'} } ) {
-              $OUT .= '<tr class="invoice_extdesc"><td></td><td';
-              $OUT .= $unitprices ? ' colspan=3>' : '>';
-              $OUT .= '<table width="100%">';
+              unless ( $section->{description_generator} ) {
+                $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">'.
+                    ( $section->{'description_generator'} ? '<td></td>' : '' ).
                     '<td align="left" '.
                          ( $ext_desc =~ /<\/?TD>/i ? '' : 'colspan=99' ). '>'.
                       '&nbsp;&nbsp;'. $ext_desc.
                     '</td>'.
                   '</tr>'
               }
-              $OUT .= '</table></td><td></td></tr>';
+              unless ( $section->{description_generator} ) {
+                $OUT .= '</table></td><td></td>';
+              }
+              $OUT .= '</tr>';
             }
           }
 
 
-          if (scalar(@sections) > 1) {
+          if ($section->{'description'} || $multisection) {
             my $style = 'border-top: 3px solid #000000;'.
                         'border-bottom: 3px solid #000000;';
             $OUT .=
               '<tr class="invoice_totaldesc">'.
-                qq(<td style="$style">&nbsp;</td>).
-                qq(<td align="left" style="$style"). 
-                  ( $unitprices ? ' colspan=3>' : '>' ).
-                  $section->{'description'}. ' Total </td>'.
-                qq(<td align="right" style="$style">).
-                  $section->{'subtotal'}. '</td>'.
-              '</tr>'
-          ;
+              qq(<td style="$style">&nbsp;</td>);
+            if ($section->{total_generator}) {
+              $OUT .= &{$section->{total_generator}}($section);
+            } else {
+              $OUT .= qq(<td align="left" style="$style"). 
+                      ( $unitprices ? ' colspan=3>' : '>' ).
+                      $section->{'description'}. ' Total </td>'.
+                      qq(<td align="right" style="$style">).
+                      $section->{'subtotal'}. '</td>';
+            }
+            $OUT .= '</tr>';
           }
         } 
         if ($section->{'posttotal'}) {
-          $OUT .= '<tr><td align="right" colspan=5>';
+          $OUT .= '<tr><td align="right" colspan='. $columncount. '>';
           $OUT .=
             '<p><font size="+1">'. $section->{'posttotal'}.
             '</font>'.
@@ -192,6 +223,8 @@
           $OUT .= '</td></tr>';
         }
 
+        $notfirst++;
+
       }
 
       my $style = 'border-top: 3px solid #000000;';
@@ -200,18 +233,21 @@
       foreach my $line ( @total_items ) {
 
         $style .= 'border-bottom: 3px solid #000000;'
-          if ++$linenum == scalar(@total_items);
+          if ++$linenum == scalar(@total_items) - ( $balance_due_below_line ? 1 : 0 );
 
         $OUT .=
-          '<tr class="invoice_totaldesc">'.
-            qq(<td style="$style">&nbsp;</td>).
-            qq(<td align="left" style="$style").
-            ( $unitprices ? ' colspan=3>' : '>' ).
-              $line->{'total_item'}. '</td>'.
-            qq(<td align="right" style="$style">).
-              $line->{'total_amount'}. '</td>'.
-          '</tr>'
-        ;
+          '<tr class="invoice_totaldesc">';
+        if ($section->{total_line_generator}) {
+          $OUT .= &{$section->{total_line_generator}}($line);
+        } else {
+          $OUT .= qq(<td style="$style">&nbsp;</td>).
+                  qq(<td align="left" style="$style" colspan=").
+                    ( $columncount - 2 ). '">'.
+                    $line->{'total_item'}. '</td>'.
+                  qq(<td align="right" style="$style">).
+                    $line->{'total_amount'}. '</td>';
+        }
+        $OUT .= '</tr>';
 
         $style='';
 
@@ -221,9 +257,15 @@
   </table>
   <br><br>
 
-<%= length($summary) ? '' : $notes %>
+<%= length($summary)
+      ? ''
+      : ( $smallernotes
+            ? '<FONT SIZE="-1">'.$notes.'</FONT>'
+            : $notes
+        )
+%>
 
   <hr NOSHADE SIZE=2 COLOR="#000000">
-  <p align="center"><%= $footer %>
+  <p align="center" <%= $smallerfooter ? 'STYLE="font-size:75%;"' : '' %>><%= $footer %>
 
 </td></tr></table>