X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_latex;h=aaec6be2129aeea9f25d5919fc13b7a3a2a1676a;hb=3e9d87cff65fea3973ecc00c648454b5f58a9c78;hp=d04507d990fa759b08188e9f39639f156e73eaee;hpb=177001fe6d444a507e2929c416ef3d4f5f108643;p=freeside.git

diff --git a/conf/invoice_latex b/conf/invoice_latex
index d04507d99..aaec6be21 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 
 \documentclass[letterpaper]{article}
 
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption,multirow,bigstrut}
+\usepackage{fancyhdr,lastpage,ifthen,fslongtable,afterpage,caption,multirow,bigstrut}
 \usepackage{graphicx}			% required for logo graphic
 
 \addtolength{\voffset}{-0.0cm}		% top margin to top of header
@@ -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,27 @@
 \renewcommand{\familydefault}{phv}
 
 
-% Commands for freeside description...
+% Commands for freeside table header...
+
+\newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }
+\newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }
+\newcommand{\FSunitcolumns}{ [@-- $unitprices ? '\makebox[2.5cm][l]{\textbf{~~Unit Price}}&\makebox[1.4cm]{\textbf{~Quantity}}&' : '' --@] }
+
+\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]{}&
+  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{Description}}}&
+  \FSunitcolumns
+  \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}} &
@@ -192,7 +212,7 @@
 [@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]
 \addressinset \rule{0.5cm}{0cm} 
 \makebox{
-\begin{minipage}[t]{5.0cm}
+\begin{minipage}[t]{7.0cm}
 \vspace{0.25cm}
 \textbf{[@-- $payname --@]}\\
 \addressline{[@-- $company --@]}
@@ -213,9 +233,6 @@
     $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 .= '';
   }
@@ -243,30 +260,10 @@ Terms: [@-- $terms --@]\\
     $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';