import sql-ledger 2.4.4SQL_LEDGER

1 files changed, 84 insertions, 80 deletions

diff --git a/sql-ledger/templates/Default-invoice.tex b/sql-ledger/templates/Default-invoice.tex
index 58a340d5e..a57f98b07 100644
--- a/sql-ledger/templates/Default-invoice.tex
+++ b/sql-ledger/templates/Default-invoice.tex
@@ -1,9 +1,10 @@
-\documentclass[twoside]{scrartcl}
+\documentclass[10pt,letterpaper,oneside,onecolumn]{scrartcl}
 \usepackage[frame]{xy}
 \usepackage{tabularx}
 \usepackage[latin1]{inputenc}
+\usepackage{graphicx}
 \setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
+\setlength{\hoffset}{-1.9cm}
 \setlength{\topmargin}{0cm}
 \setlength{\headheight}{0.5cm}
 \setlength{\headsep}{1cm}
@@ -11,41 +12,51 @@
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
 \setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
+\setlength{\textheight}{24.7cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
+
 \begin{document}
 
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\pagestyle{myheadings}
+\thispagestyle{empty}
 
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
+\newsavebox{\ftr}
+\sbox{\ftr}{
   \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
+  \tiny
+  \rule[1.5em]{\textwidth}{0.5pt}
+Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will acrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge.
+A return authorization must be obtained from <%company%> before goods are returned. Returns must be shipped prepaid and properly insured.
+<%company%> will not be responsible for damages during transit.
   }
 }
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
 
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
+\vspace*{-1.3cm}
 
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
+\parbox{\textwidth}{%
+  \parbox[b]{.42\textwidth}{%
+    <%company%>
+   
+    <%address%>
+  }
+  \parbox[b]{.2\textwidth}{
+    \includegraphics[scale=0.3]{sql-ledger}
+  }\hfill
+  \begin{tabular}[b]{rr@{}}
+  Telephone & <%tel%>\\
+  Facsimile & <%fax%>
+  \end{tabular}
+
+  \rule[1.5em]{\textwidth}{0.5pt}
+}
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
+
+<%pagebreak 90 27 37%>
+\end{tabularx}
 
   \rule{\textwidth}{2pt}
   
@@ -56,43 +67,40 @@
 
 \newpage
 
-\markright{<%company%>\hfill <%invnumber%>}
+\markboth{<%company%>\hfill <%invnumber%>}{<%company%>\hfill <%invnumber%>}
 
 \vspace*{-12pt}
 
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-  & carried forward from page <%lastpage%> & & & & & <%sumcarriedforward%> \\
+\begin{tabularx}{\textwidth}{@{}rlXlrlrrr@{}}
+  \textbf{Pos} & \textbf{Number} & \textbf{Description} & & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\ [0.5em]
+  & carried forward from page <%lastpage%> & & & & & & <%sumcarriedforward%> \\ [0.5em]
 <%end pagebreak%>
 
 
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
-  \parbox[t]{10.5cm}{
-  \textbf{To}
-  \vspace{0.5cm}
+\parbox[t]{.6\textwidth}{
+\textbf{To}
+\vspace{0.7cm}
 
 <%name%>
 
-<%addr1%>
+<%address1%>
 
-<%addr2%>
+<%address2%>
 
-<%addr3%>
+<%city%> <%state%> <%zipcode%>
 
-<%addr4%>
+<%country%>
 
 \vspace{0.3cm}
 
-%<%if contact%>
-%Attn: <%contact%>
-%\vspace{0.3cm}
-%<%end contact%>
-\vspace{0.5cm}
+<%if contact%>
+<%contact%>
+\vspace{0.2cm}
+<%end contact%>
 
 <%if customerphone%>
 Tel: <%customerphone%>
@@ -104,27 +112,25 @@ Fax: <%customerfax%>
 
 <%email%>
 }
-\parbox[t]{7.5cm}{
+\parbox[t]{.4\textwidth}{
 \textbf{Ship To}
-\vspace{0.5cm}
+\vspace{0.7cm}
 
 <%shiptoname%>
 
-<%shiptoaddr1%>
+<%shiptoaddress1%>
 
-<%shiptoaddr2%>
+<%shiptoaddress2%>
 
-<%shiptoaddr3%>
+<%shiptocity%> <%shiptostate%> <%shiptozipcode%>
 
-<%shiptoaddr4%>
-
-\vspace{0.3cm}
+<%shiptocountry%>
 
 \vspace{0.3cm}
 
 <%if shiptocontact%>
-Attn: <%shiptocontact%>
-\vspace{0.3cm}
+<%shiptocontact%>
+\vspace{0.2cm}
 <%end shiptocontact%>
 
 <%if shiptophone%>
@@ -146,23 +152,26 @@ Fax: <%shiptofax%>
 
 \vspace{1cm}
 
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Number} & <%invnumber%> \\
-  \textbf{Order} & <%ordnumber%> \\
-  \textbf{Clerk} & <%employee%>
-\end{tabular}
+\begin{tabularx}{\textwidth}{*{7}{|X}|} \hline
+  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} & \textbf{Order \#}
+  & \textbf{Salesperson} & \textbf{Shipping Point} &
+  \textbf{Ship via} \\ [0.5em]
+  \hline
+  <%invnumber%> & <%invdate%> & <%duedate%> & <%ordnumber%> & <%employee%>
+  & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
 
 \vspace{1cm}
 
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
+\begin{tabularx}{\textwidth}{@{}rlXlrlrrr@{}}
+  \textbf{Pos} & \textbf{Number} & \textbf{Description} & & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\ [0.5em]
 <%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
+  <%runningnumber%> & <%number%> & <%description%> & <%deliverydate%> &
+  <%qty%> & <%unit%> & <%sellprice%> & <%discountrate%> & <%linetotal%> \\
 <%end number%>
-\end{tabular*}
+\end{tabularx}
 
 
 \parbox{\textwidth}{
@@ -172,21 +181,24 @@ Fax: <%shiptofax%>
 
 \hfill
 \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+  Subtotal & <%subtotal%> \\
 <%foreach tax%>
   <%taxdescription%> on <%taxbase%> & <%tax%> \\
 <%end tax%>
 <%if paid%>
-  \textbf{Paid} & - <%paid%> \\
+  Paid & - <%paid%> \\
 <%end paid%>
   \hline
-  \textbf{Balance Owing} & \textbf{<%total%>} \\
+<%if total%>
+  Balance Due & <%total%>
+<%end total%>
 \end{tabularx}
 
 \vspace{0.3cm}
 
+<%text_amount%> ***** <%decimal%>/100
 \hfill
-  All prices in \textbf{<%currency%>} funds.
+All prices in \textbf{<%currency%>}.
 
 \vspace{12pt}
 
@@ -202,7 +214,7 @@ Fax: <%shiptofax%>
 \begin{tabularx}{10cm}{@{}lXlr@{}}
   \textbf{Payments} & & & \\
   \hline
-  \textbf{Date} & \textbf{Account} & \textbf{Source} & \textbf{Amount} \\
+  \textbf{Date} & & \textbf{Source} & \textbf{Amount} \\
 <%end paid%>
 <%foreach payment%>
   <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%payment%> \\
@@ -215,17 +227,9 @@ Fax: <%shiptofax%>
 
 \centerline{\textbf{Thank You for your valued business!}}
 
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+\rule{\textwidth}{0.5pt}
 
-\footnotetext[1]{\tiny
-Payment due NET <%terms%> Days from date of Invoice. Interest on overdue
-amounts will acrue at the rate of 1.5\% per month starting <%duedate%>
-until paid in full. Items returned are subject to a 10\% restocking charge.
-A return authorization must be obtained from <%company%> before goods are
-returned. Returns must be shipped prepaid and properly insured.
-<%company%> will not be responsible for damages during transit.}
+\usebox{\ftr}
 
 \end{document}
 
-
-