thank you IE8

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index d04507d..7facc19 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -19,7 +19,7 @@
 \r
 \documentclass[letterpaper]{article}\r
 \r
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption,multirow,bigstrut}\r
+\usepackage{fancyhdr,lastpage,ifthen,fslongtable,afterpage,caption,multirow,bigstrut}\r
 \usepackage{graphicx}                  % required for logo graphic\r
 \r
 \addtolength{\voffset}{-0.0cm}         % top margin to top of header\r
@@ -51,7 +51,7 @@
   }\r
 }\r
 \r
-\newcommand{\extracouponspace}{4.8cm}\r
+\newcommand{\extracouponspace}{3.6cm}\r
 \r
 % Adjust the inset of the mailing address\r
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}\r
@@ -156,7 +156,27 @@
 \renewcommand{\familydefault}{phv}\r
 \r
 \r
-% Commands for freeside description...\r
+% Commands for freeside table header...\r
+\r
+\newcommand{\FSdescriptionlength} { [@-- $unitprices ? '8.2cm' : '12.8cm' --@] }\r
+\newcommand{\FSdescriptioncolumncount} { [@-- $unitprices ? '4' : '6' --@] }\r
+\newcommand{\FSunitcolumns}{ [@-- $unitprices ? '\makebox[2.5cm][l]{\textbf{~~Unit Price}}&\makebox[1.4cm]{\textbf{~Quantity}}&' : '' --@] }\r
+\r
+\newcommand{\FShead}{\r
+  \hline\r
+  \rule{0pt}{2.5ex}\r
+  \makebox[1.4cm]{\textbf{Ref}} &\r
+%  \makebox[2.9cm][l]{\textbf{Description}}&\r
+%  \makebox[1.4cm][l]{}&\r
+%  \makebox[1.4cm][l]{}&\r
+%  \makebox[2.5cm][l]{}&\r
+  \multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{Description}}}&\r
+  \FSunitcolumns\r
+  \makebox[1.6cm][r]{\textbf{Amount}} \\\r
+  \hline\r
+}\r
+\r
+% ...description...\r
 \newcommand{\FSdesc}[5]{\r
   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
   \multicolumn{4}{l}{\textbf{#2}} &\r
@@ -177,22 +197,10 @@
 \r
 \r
 \begin{document}\r
-%\r
-%%     Headers and footers defined for the first page\r
-%\r
-%%     The LH Heading comprising logo\r
-%%     UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo\r
-%\r
-%%     The Heading comprising isue date, customer ref & INVOICE name\r
-%\r
-%%     Header & footer changes for subsequent pages\r
-%\r
-%\r
-%\r
-[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]\r
+%      Headers and footers defined for the first page\r
 \addressinset \rule{0.5cm}{0cm} \r
 \makebox{\r
-\begin{minipage}[t]{5.0cm}\r
+\begin{minipage}[t]{7.0cm}\r
 \vspace{0.25cm}\r
 \textbf{[@-- $payname --@]}\\\r
 \addressline{[@-- $company --@]}\r
@@ -213,9 +221,6 @@
     $OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";\r
     $OUT .= "\\addressline{$ship_country}";\r
     $OUT .= '~\\\\';\r
-    $OUT .= "\\textbf{ID:}~~$agent_custid\\\\" if $agent_custid;\r
-    $OUT .= "\\textbf{Fax:}~~$ship_fax\\\\" if $ship_fax;\r
-    $OUT .= '~\\\\' if ($ship_fax or $agent_custid);\r
   }else{\r
     $OUT .= '';\r
   }\r
@@ -243,30 +248,10 @@ Terms: [@-- $terms --@]\\
     $OUT .= '\caption*{ ';\r
     $OUT .= ($section->{'description'}) ? $section->{'description'}: 'Charges';\r
     $OUT .= '}\\\\';\r
-    $OUT .= '\hline';\r
-    $OUT .= '\rule{0pt}{2.5ex}';\r
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';\r
-    $OUT .= '\hline';\r
+    $OUT .= '\FShead';\r
     $OUT .= '\endfirsthead';\r
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\\';\r
-    $OUT .= '\hline';\r
-    $OUT .= '\rule{0pt}{2.5ex}';\r
-    $OUT .= '\makebox[1.4cm]{\textbf{Ref}} & ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{Description}}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{}& ';\r
-    $OUT .= '\makebox[2.0cm][l]{\textbf{'. ($unitprices ? '~~Unit Price' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm]{\textbf{'. ($unitprices ? '~Quantity' : ''). '}}&';\r
-    $OUT .= '\makebox[2.0cm][r]{\textbf{Amount}} \\\\';\r
-    $OUT .= '\hline';\r
+    $OUT .= '\FShead';\r
     $OUT .= '\endhead';\r
     $OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\\';\r
     $OUT .= '\endfoot';\r
@@ -333,5 +318,8 @@ Terms: [@-- $terms --@]\\
 \r
 --@]\r
 \vfill\r
-[@-- $notes --@]\r
+\begin{minipage}[t]{\textwidth}\r
+  [@-- $notes --@]\r
+  [@-- $coupon ? '\ifthenelse{\equal{\thepage}{1}}{\rule{0pt}{\extracouponspace}}{}' : '' --@]\r
+\end{minipage}\r
 \end{document}\r