thank you IE8

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index a1f9da7..86fbe0e 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -49,7 +49,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
@@ -154,7 +154,22 @@
 \renewcommand{\familydefault}{phv}\r
 \r
 \r
-% Commands for freeside description...\r
+% Commands for freeside table header...\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
+  \makebox[2.5cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
+  \makebox[1.4cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\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
@@ -166,7 +181,7 @@
 \newcommand{\FSextdesc}[1]{\r
   \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &\r
 %%  \multicolumn{2}{l}{\small{~-~#1}}\\\r
-  ~~~#1\\\r
+#1\\\r
 }\r
 % ...and total line items.\r
 \newcommand{\FStotaldesc}[2]{\r
@@ -202,7 +217,6 @@
 \hfill\r
 \makebox{\r
 \begin{minipage}[t]{6.4cm}\r
-\begin{flushright}\r
 [@--\r
   if ($ship_enable) {\r
     $OUT .= '\textbf{Service Address}\\\\';\r
@@ -212,13 +226,11 @@
     $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
 --@]\r
+\begin{flushright}\r
 Terms: [@-- $terms --@]\\\r
 [@-- $po_line --@]\\\r
 \end{flushright}\r
@@ -227,31 +239,10 @@ Terms: [@-- $terms --@]\\
 %\r
 \section*{\textsc{Charges}}\r
 \begin{longtable}{cllllllr}\r
-\hline\r
-\rule{0pt}{2.5ex}\r
-\makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[2.0cm][l]{\textbf{Description}}&\r
-\makebox[2.0cm][l]{}&\r
-\makebox[2.0cm][l]{}&\r
-\makebox[2.0cm][l]{}&\r
-\makebox[2.0cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
-\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
-\makebox[2.0cm][r]{\textbf{Amount}} \\\r
-%\r
-\hline\r
+\FShead\r
 \endfirsthead\r
 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\\r
-\hline\r
-\rule{0pt}{2.5ex}\r
-\makebox[1.4cm]{\textbf{Ref}} & \r
-\makebox[2.0cm][l]{\textbf{Description}}&\r
-\makebox[2.0cm][l]{}&\r
-\makebox[2.0cm][l]{}&\r
-\makebox[2.0cm][l]{}&\r
-\makebox[2.0cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
-\makebox[2.0cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\r
-\makebox[2.0cm][r]{\textbf{Amount}} \\\r
-\hline\r
+\FShead\r
 \endhead\r
 \multicolumn{7}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\\r
 \endfoot\r
@@ -284,7 +275,9 @@ Terms: [@-- $terms --@]\\
       if ( $ext_desc !~ /[^\\]&/ ) {   \r
         $ext_desc = substr($ext_desc, 0, 80) . '...'\r
           if (length($ext_desc) > 80);\r
-        $ext_desc = '\small{'. $ext_desc. '}';\r
+        $ext_desc = '\multicolumn{6}{l}{\small{~~~'. $ext_desc. '}}';\r
+      }else{\r
+        $ext_desc = "~~~$ext_desc";\r
       }\r
       $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";\r
     }\r