X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=fe910b24e036be3f2236d04a1ba22751663fa262;hb=20d7ca3a3e37b9748eed3f7ef362f04c757420ba;hp=8d486779ec0c895ee4473484093ea7c123e81bcc;hpb=97c8cbe1a7645ecce1192a1c3c20807e428f907c;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 8d486779e..fe910b24e 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -168,7 +168,7 @@
 \newcommand{\FSextdesc}[1]{
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
 %%  \multicolumn{2}{l}{\small{~-~#1}}\\
-  ~~~#1\\
+#1\\
 }
 % ...and total line items.
 \newcommand{\FStotaldesc}[2]{
@@ -204,7 +204,6 @@
 \hfill
 \makebox{
 \begin{minipage}[t]{6.4cm}
-\begin{flushright}
 [@--
   if ($ship_enable) {
     $OUT .= '\textbf{Service Address}\\\\';
@@ -221,6 +220,7 @@
     $OUT .= '';
   }
 --@]
+\begin{flushright}
 Terms: [@-- $terms --@]\\
 [@-- $po_line --@]\\
 \end{flushright}
@@ -235,6 +235,7 @@ Terms: [@-- $terms --@]\\
       $OUT .= '\large\textsc{'. $section->{'pretotal'}. '}\\\\';
       $OUT .= '\\end{flushright}';
     }
+    $OUT .= '\pagebreak' if $section{'post_total'};
     $OUT .= '\captionsetup{singlelinecheck=false,justification=raggedright,font={Large,sc,bf}}';
     $OUT .= '\begin{longtable}{cllllllr}';
     $OUT .= '\caption*{ ';
@@ -284,6 +285,7 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\hline';
     $OUT .= '\endlastfoot';
 
+    my $lastref = 0;
     foreach my $line (
       grep { ( scalar( @sections ) > 1 
              ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -296,17 +298,22 @@ 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 !~ /[^\\]&/ ) {
           $ext_desc = substr($ext_desc, 0, 80) . '...'
             if (length($ext_desc) > 80);
-          $ext_desc = '\small{'. $ext_desc. '}';
+          $ext_desc = '\multicolumn{6}{l}{\small{~~~'. $ext_desc. '}}';
+        }else{
+          $ext_desc = "~~~$ext_desc";
         }
         $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
       }