X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=d819160195eb9260fc3f2f914f26521ee49752e2;hb=9c42579467b332e5b188c75e5acb109eb33b7297;hp=2acd7102d4b95d366d92a9e0426ef144983e540f;hpb=988ec48fea05902eb7ea22e43a44e86a36eee06a;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 2acd7102d..d81916019 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -51,7 +51,7 @@
   }
 }
 
-\newcommand{\extracouponspace}{4.8cm}
+\newcommand{\extracouponspace}{3.6cm}
 
 % Adjust the inset of the mailing address
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}
@@ -156,7 +156,22 @@
 \renewcommand{\familydefault}{phv}
 
 
-% Commands for freeside description...
+% Commands for freeside table header...
+\newcommand{\FShead}{
+  \hline
+  \rule{0pt}{2.5ex}
+  \makebox[1.4cm]{\textbf{Ref}} &
+  \makebox[2.9cm][l]{\textbf{Description}}&
+  \makebox[1.4cm][l]{}&
+  \makebox[1.4cm][l]{}&
+  \makebox[2.5cm][l]{}&
+  \makebox[2.5cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&
+  \makebox[1.4cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&
+  \makebox[1.6cm][r]{\textbf{Amount}} \\
+  \hline
+}
+
+% ...description...
 \newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
   \multicolumn{4}{l}{\textbf{#2}} &
@@ -168,7 +183,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 +219,6 @@
 \hfill
 \makebox{
 \begin{minipage}[t]{6.4cm}
-\begin{flushright}
 [@--
   if ($ship_enable) {
     $OUT .= '\textbf{Service Address}\\\\';
@@ -214,10 +228,14 @@
     $OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";
     $OUT .= "\\addressline{$ship_country}";
     $OUT .= '~\\\\';
+    $OUT .= "\\textbf{ID:}~~$agent_custid\\\\" if $agent_custid;
+    $OUT .= "\\textbf{Fax:}~~$ship_fax\\\\" if $ship_fax;
+    $OUT .= '~\\\\' if ($ship_fax or $agent_custid);
   }else{
     $OUT .= '';
   }
 --@]
+\begin{flushright}
 Terms: [@-- $terms --@]\\
 [@-- $po_line --@]\\
 \end{flushright}
@@ -232,35 +250,18 @@ 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 .= '\ifthenelse{\equal{\thepage}{1}}{\setlength{\LTextracouponspace}{\extracouponspace}}{\setlength{\LTextracouponspace}{0pt}}'
+      if $coupon;
     $OUT .= '\begin{longtable}{cllllllr}';
     $OUT .= '\caption*{ ';
     $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';
     $OUT .= '}\\\\';
-    $OUT .= '\hline';
-    $OUT .= '\rule{0pt}{2.5ex}';
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
-    $OUT .= '\hline';
+    $OUT .= '\FShead';
     $OUT .= '\endfirsthead';
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
-    $OUT .= '\hline';
-    $OUT .= '\rule{0pt}{2.5ex}';
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{}& ';
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}&';
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}&';
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';
-    $OUT .= '\hline';
+    $OUT .= '\FShead';
     $OUT .= '\endhead';
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
     $OUT .= '\endfoot';
@@ -281,6 +282,7 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\hline';
     $OUT .= '\endlastfoot';
 
+    my $lastref = 0;
     foreach my $line (
       grep { ( scalar( @sections ) > 1 
              ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -293,17 +295,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";
       }