X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=ddd068ed6e91fc58e4cacc7353dacc6835c7669e;hb=efc68f41987d007de5e792b88df1c63bf3dedf4c;hp=d17ff8f6dde0a340fbed0d89cbc1823579855a1b;hpb=9c236c52118ead925e960571f0532fa064fd81bf;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index d17ff8f6d..ddd068ed6 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -157,16 +157,18 @@
 
 
 % Commands for freeside description...
-\newcommand{\FSdesc}[3]{
+\newcommand{\FSdesc}[5]{
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &
-  \multicolumn{6}{l}{\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}}\\
-  ~-~#1\\
+#1\\
 }
 % ...and total line items.
 \newcommand{\FStotaldesc}[2]{
@@ -202,7 +204,6 @@
 \hfill
 \makebox{
 \begin{minipage}[t]{6.4cm}
-\begin{flushright}
 [@--
   if ($ship_enable) {
     $OUT .= '\textbf{Service Address}\\\\';
@@ -212,10 +213,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}
@@ -238,16 +243,26 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\hline';
     $OUT .= '\rule{0pt}{2.5ex}';
     $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\multicolumn{6}{l}{\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{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';
     $OUT .= '\hline';
     $OUT .= '\rule{0pt}{2.5ex}';
     $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';
-    $OUT .= '\multicolumn{6}{l}{\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{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';
@@ -269,6 +284,7 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\hline';
     $OUT .= '\endlastfoot';
 
+    my $lastref = 0;
     foreach my $line (
       grep { ( scalar( @sections ) > 1 
              ? $section->{'description'} eq $_->{'section'}->{'description'}
@@ -281,15 +297,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";
       }