bundled package presentation improvements

2 files changed, 14 insertions, 4 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index 06980b021..806c5deb4 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -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>' : '>';
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 6bfc41d5a..ddd068ed6 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -284,6 +284,7 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\hline';

     $OUT .= '\endlastfoot';

 

+    my $lastref = 0;

     foreach my $line (

       grep { ( scalar( @sections ) > 1 

              ? $section->{'description'} eq $_->{'section'}->{'description'}

@@ -296,11 +297,14 @@ Terms: [@-- $terms --@]\\
       # 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 !~ /[^\\]&/ ) {