X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FService-statement.tex;h=c927c5da5d0cc908db6120eb9499a516ff19e2de;hp=0b63f75233a48ba08a5f027c159913b8c59c7159;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/Service-statement.tex b/sql-ledger/templates/Service-statement.tex
index 0b63f7523..c927c5da5 100644
--- a/sql-ledger/templates/Service-statement.tex
+++ b/sql-ledger/templates/Service-statement.tex
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%statementdate%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-  carried forward from <%lastpage%> & & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
@@ -76,13 +53,17 @@
   
 <%name%>
 
-<%addr1%>
+<%address1%>
 
-<%addr2%>
+<%if address2%>
+<%address2%>
+<%end address2%>
 
-<%addr3%>
+<%city%> <%state%> <%zipcode%>
 
-<%addr4%>
+<%if country%>
+<%country%>
+<%end country%>
 
 }
 \parbox[t]{7.5cm}{
@@ -100,24 +81,22 @@ Fax: <%customerfax%>
 
 \vspace{1cm}
 
-\textbf{S T A T E M E N T} \hfill
-
-\hfill <%statementdate%>
+\textbf{S T A T E M E N T} \hfill \textbf{<%statementdate%>}
 
 \vspace{2cm}
 
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
+\begin{tabular*}{\textwidth}{@{}ll@{\extracolsep\fill}ccrrrr@{}}
+  \textbf{Invoice \#} & \textbf{Order \#} & \textbf{Date} & \textbf{Due} &
   \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
 <%foreach invnumber%>
-  <%invnumber%> & <%invdate%> & <%duedate%> &
+  <%invnumber%> & <%ordnumber%> & <%invdate%> & <%duedate%> &
   <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
 <%end invnumber%>
-\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
+\textbf{Subtotal} & & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
 \end{tabular*}
 \rule{\textwidth}{1pt}
 
-\vspace{1cm}
+\vspace{0.5cm}
 
 \hfill
 \begin{tabularx}{7cm}{Xr@{}}
@@ -128,10 +107,5 @@ Fax: <%customerfax%>
 
 Please make check payable to <%company%>
 
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-}
-
 \end{document}