stray closing /TABLE in the no-ticket case

[freeside.git] / conf / invoice_latexcoupon

diff --git a/conf/invoice_latexcoupon b/conf/invoice_latexcoupon
index 327c121..2380226 100644 (file)
--- a/conf/invoice_latexcoupon
+++ b/conf/invoice_latexcoupon
@@ -1,15 +1,15 @@
-Detach and return this remittance form with your your payment.\\\r
+Detach and return this remittance form with your payment.\\\r
 \begin{tabular}{ll}\r
 \begin{tabular}{ll}\r
 \returninset\r
 \begin{tabular}{ll}\r
-  \makebox{ \includegraphics{[@-- $logo_file --@]}} &\r
+  \makebox{ \includegraphics{[@-- $logo_file --@]}} & [@-- $verticalreturnaddress ? '\\\\' : '' --@]\r
   \begin{minipage}[b]{5.5cm}\r
 [@-- $returnaddress --@]\r
-    \end{minipage}\r
+    \end{minipage}\\\r
 \end{tabular}&\r
 \begin{tabular}{r@{: }lr}\r
-Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{\r
+Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{[@-- $verticalreturnaddress ? '\\rule{1.5cm}{0cm}' : '' --@]\r
 \makebox{\r
 \begin{minipage}[t]{7.0cm}\r
 \textbf{[@-- $payname --@]}\\\r
@@ -18,18 +18,19 @@ Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{
 \addressline{[@-- $address2 --@]}\r
 \addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}\r
 \addressline{[@-- $country --@]}\r
+[@-- $barcode_file ? '\\\\ \includegraphics{'.$barcode_file.'}' : "\\" --@]\r
 \end{minipage}}}\\\r
 Customer\#& \textbf{[@-- $custnum --@]} & \\\r
 Total Due & \textbf{[@-- $balance --@]} & \\\r
-\rule{0pt}{2.25em}Amount Enclosed & \rule{2cm}{1pt}& \\\r
+\rule{0pt}{[@-- defined($amountenclosedsep) ? $amountenclosedsep : '2.25em' --@]}Amount Enclosed & \rule{2cm}{1pt}& \\\r
 \end{tabular}\\\r
-\rule{0pt}{1cm} &\\\r
+\rule{0pt}{[@-- defined($coupontoaddresssep) ? $coupontoaddresssep : '1in' --@]} &\\\r
 \end{tabular}\\\r
 \begin{tabular}{ll}\r
 \addressinset \rule{0.5cm}{0cm} &\r
 \makebox{\r
 \begin{minipage}[t]{7.0cm}\r
-[@-- $returnaddress --@]\r
+[@-- $addcompanytoaddress ? $company_name. '\\\\' : '' --@][@-- $returnaddress --@]\r
 \end{minipage}}\r
 \hfill\r
 \end{tabular}\\\r