find and correct the real double counting culprit

[freeside.git] / conf / invoice_latex

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 1369833..6f3665a 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
@@ -157,16 +157,21 @@
 \r
 \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
-  \makebox[2.5cm][l]{\textbf{[@-- $unitprices ? '~~Unit Price' : '' --@]}}&\r
-  \makebox[1.4cm]{\textbf{[@-- $unitprices ? '~Quantity' : '' --@]}}&\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
@@ -204,7 +209,6 @@
 %\r
 %\r
 %\r
-[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]\r
 \addressinset \rule{0.5cm}{0cm} \r
 \makebox{\r
 \begin{minipage}[t]{7.0cm}\r
@@ -228,9 +232,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