[freeside-commits] freeside/conf invoice_html, 1.23, 1.24 invoice_latex, 1.25, 1.26

Jeff Finucane,420,, jeff at wavetail.420.am
Fri Aug 1 21:20:21 PDT 2008


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

Modified Files:
	invoice_html invoice_latex 
Log Message:
bundled package presentation improvements

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- invoice_latex	23 Jun 2008 15:37:15 -0000	1.25
+++ invoice_latex	2 Aug 2008 04:20:19 -0000	1.26
@@ -284,6 +284,7 @@
     $OUT .= '\hline';
     $OUT .= '\endlastfoot';
 
+    my $lastref = 0;
     foreach my $line (
       grep { ( scalar( @sections ) > 1 
              ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -296,11 +297,14 @@
       # Don't break-up small packages.
       my $rowbreak = @$ext_description < 5 ? '*' : '';
   
-      $OUT .= "\\hline\n";
-      $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
+      $OUT .= "\\hline\n" if ($line->{'ref'} && $line->{'ref'} ne $lastref);
+      $OUT .= '\FSdesc'.
+              '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.
+              '{' . $line->{'description'} . '}' .
               '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
               '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .
               '{' . $line->{'amount'} . "}${rowbreak}\n";
+      $lastref = $line->{'ref'};
 
       foreach my $ext_desc (@$ext_description) {
         if ( $ext_desc !~ /[^\\]&/ ) {

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- invoice_html	24 Jun 2008 18:50:15 -0000	1.23
+++ invoice_html	2 Aug 2008 04:20:19 -0000	1.24
@@ -6,6 +6,7 @@
 .invoice_longtable table { cellspacing: none }
 .invoice_longtable TH { border-top: 2px solid #000000; border-bottom: 1px solid #000000; padding-left: none; padding-right: none; font-size: 10pt }
 .invoice_desc TD { border-top: 2px solid #000000; font-weight: bold; font-size: 10pt }
+.invoice_desc_more TD { font-weight: bold; font-size: 10pt }
 .invoice_extdesc TD { font-size: 8pt }
 .invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
 </STYLE>
@@ -123,6 +124,7 @@
             '<th align="right">Amount</th>'.
           '</tr>';
 
+        my $lastref = 0;
         foreach my $line (
           grep { ( scalar(@sections) > 1 
                  ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -131,8 +133,11 @@
           @detail_items )
         {
           $OUT .=
-            '<tr class="invoice_desc">'.
-              '<td align="center">'. $line->{'ref'}. '</td>'.
+            '<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>'.
@@ -143,6 +148,7 @@
               '<td align="right">'. $line->{'amount'}. '</td>'.
             '</tr>'
           ;
+          $lastref = $line->{'ref'};
           if ( @{$line->{'ext_description'} } ) {
             $OUT .= '<tr class="invoice_extdesc"><td></td><td';
             $OUT .= $unitprices ? ' colspan=3>' : '>';



More information about the freeside-commits mailing list