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

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 34ae4cbeb..8d486779e 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 
 \documentclass[letterpaper]{article}
 
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}
+\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption,multirow,bigstrut}
 \usepackage{graphicx}			% required for logo graphic
 
 \addtolength{\voffset}{-0.0cm}		% top margin to top of header
@@ -35,9 +35,24 @@
 \setlength{\oddsidemargin}{-0.9cm} 	% odd page left margin
 \setlength{\evensidemargin}{-0.9cm} 	% even page left margin
 
+\LTchunksize=40
+
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{1pt}
 
+\renewcommand{\footrule}{
+[@--
+  $coupon ? '\ifthenelse{\equal{\thepage}{1}}' : '';
+--@]
+  {
+  }
+  {
+    \vbox to 0pt{\rule{\headwidth}{\footrulewidth}\vss}
+  }
+}
+
+\newcommand{\extracouponspace}{4.8cm}
+
 % Adjust the inset of the mailing address
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}
 
@@ -45,7 +60,7 @@
 \newcommand{\returninset}[1][]{\hspace{-0.25cm}}
 
 % New command for address lines i.e. skip them if blank
-\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\newline}}
+\newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\\}}
 
 % Inserts dollar symbol
 \newcommand{\dollar}[1][]{\symbol{36}}
@@ -60,9 +75,16 @@
 \fancyfoot[C]{
   \ifthenelse{\equal{\thepage}{1}}
   { % First page
-    \small{
+[@--
+  if ($coupon) {
+    $OUT .= '\vspace{-\extracouponspace}';
+    $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';
+    $OUT .= $coupon;
+  }
+  '';
+--@] \small{
 [@-- $footer --@]
-    }
+    }[@-- $coupon ? '\vspace{\extracouponspace}' : '' --@]
   }
   { % ... pages
     \small{
@@ -135,19 +157,22 @@
 
 
 % Commands for freeside description...
-\newcommand{\FSdesc}[3]{
+\newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
-  \textbf{#2} &
-  \multicolumn{1}{r}{\textbf{\dollar #3}}\\
+  \multicolumn{4}{l}{\textbf{#2}} &
+  \multicolumn{1}{l}{\textbf{#3}} &
+  \multicolumn{1}{r}{\textbf{#4}} &
+  \multicolumn{1}{r}{\textbf{\dollar #5}}\\
 }
 % ...extended description...
 \newcommand{\FSextdesc}[1]{
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &
-  \multicolumn{2}{l}{\small{~-~#1}}\\
+%%  \multicolumn{2}{l}{\small{~-~#1}}\\
+  ~~~#1\\
 }
 % ...and total line items.
 \newcommand{\FStotaldesc}[2]{
-  & \multicolumn{1}{l}{#1} & #2\\
+  & \multicolumn{6}{l}{#1} & #2\\
 }
 
 
@@ -164,8 +189,8 @@
 %
 %
 %
-\begin{tabular}{ll}
-\addressinset \rule{0cm}{0cm} &
+[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]
+\addressinset \rule{0.5cm}{0cm} 
 \makebox{
 \begin{minipage}[t]{5.0cm}
 \vspace{0.25cm}
@@ -176,38 +201,71 @@
 \addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}
 \addressline{[@-- $country --@]}
 \end{minipage}}
-\end{tabular}
 \hfill
 \makebox{
 \begin{minipage}[t]{6.4cm}
 \begin{flushright}
+[@--
+  if ($ship_enable) {
+    $OUT .= '\textbf{Service Address}\\\\';
+    $OUT .= "\\addressline{$ship_company}";
+    $OUT .= "\\addressline{$ship_address1}";
+    $OUT .= "\\addressline{$ship_address2}";
+    $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 .= '';
+  }
+--@]
 Terms: [@-- $terms --@]\\
 [@-- $po_line --@]\\
 \end{flushright}
 \end{minipage}}
 \vspace{1.5cm}
 %
+\section*{}
 [@--
   foreach my $section ( @sections ) {
-    $OUT .= '\section*{\textsc{';
-    $OUT .= ($section->{'description'}) ? $section->{'description'} : 'Charges';
-    $OUT .= '}}\begin{longtable}{clr}';
+    if ($section->{'pretotal'}) {
+      $OUT .= '\begin{flushright}';
+      $OUT .= '\large\textsc{'. $section->{'pretotal'}. '}\\\\';
+      $OUT .= '\\end{flushright}';
+    }
+    $OUT .= '\captionsetup{singlelinecheck=false,justification=raggedright,font={Large,sc,bf}}';
+    $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[12.8cm][l]{\textbf{Description}} & ';
-    $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';
+    $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 .= '\endfirsthead';
-    $OUT .= '\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
+    $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[12.8cm][l]{\textbf{Description}} & ';
-    $OUT .= '\makebox[2.5cm][r]{\textbf{Amount}} \\\\';
+    $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 .= '\endhead';
-    $OUT .= '\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
+    $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
     $OUT .= '\endfoot';
     $OUT .= '\hline';
 
@@ -216,12 +274,12 @@ Terms: [@-- $terms --@]\\
               '{' . $section->{'subtotal'} . '}' . "\n";
     }
 
-    if ($section == $sections[$#sections]) {
-      foreach my $line (@total_items) {
+    #if ($section == $sections[$#sections]) {
+      foreach my $line (grep {$_->{section}->{description} eq $section->{description}} @total_items) {
         $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .
                 '{' . $line->{'total_amount'} . '}' . "\n";
       }
-    }
+    #}
 
     $OUT .= '\hline';
     $OUT .= '\endlastfoot';
@@ -240,23 +298,28 @@ Terms: [@-- $terms --@]\\
   
       $OUT .= "\\hline\n";
       $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .
+              '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.
+              '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .
               '{' . $line->{'amount'} . "}${rowbreak}\n";
 
-      if (@$ext_description) {
-        $OUT .= '\multicolumn{1}{l}{\rule{0pt}{1.0ex}} &';
-        $OUT .= '\multicolumn{2}{l}{\small{\begin{tabular}{llllll}';#cheating at 6
-        foreach my $ext_desc (@$ext_description) {
+      foreach my $ext_desc (@$ext_description) {
+        if ( $ext_desc !~ /[^\\]&/ ) {
           $ext_desc = substr($ext_desc, 0, 80) . '...'
             if (length($ext_desc) > 80);
-          $OUT .= "$ext_desc \\\\${rowbreak}\n";
+          $ext_desc = '\small{'. $ext_desc. '}';
         }
-        $OUT .="\\end{tabular}}}\\\\${rowbreak}\n";
+        $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";
       }
 
     }
 
     $OUT .= '\end{longtable}';
 
+    if ($section->{'posttotal'}) {
+      $OUT .= '\begin{flushright}';
+      $OUT .= '\normalfont\large\bfseries\textsc{'. $section->{'posttotal'}. '}\\\\';
+      $OUT .= '\\end{flushright}';
+    }
   }
 
 --@]