--- invoice.tex.orig	2005-08-14 13:53:10.000000000 +0200
+++ invoice.tex	2006-03-22 23:53:34.000000000 +0100
@@ -12,14 +12,14 @@
 \setlength{\topskip}{0pt}
 \setlength{\oddsidemargin}{1.0cm}
 \setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
+\setlength{\textwidth}{18.2cm}
 \setlength{\textheight}{24.5cm}
 \setlength{\footskip}{1cm}
 \setlength{\parindent}{0pt}
 \renewcommand{\baselinestretch}{1}
 \begin{document}
 
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
 
 \newsavebox{\hdr}
 \sbox{\hdr}{
@@ -31,8 +31,13 @@
       
       <?lsmb address ?>}\hfill
     \begin{tabular}[b]{rr@{}}
+<?lsmb if tel ?>
     Tlf. & <?lsmb tel ?>\\
-    Fax & <?lsmb fax ?>
+<?lsmb end tel ?>
+<?lsmb if fax ?>
+    Fax & <?lsmb fax ?>\\
+<?lsmb end fax ?>
+
     \end{tabular}
 
     \rule[1.5ex]{\textwidth}{0.5pt}
@@ -81,7 +86,7 @@
 <?lsmb address2 ?>
 <?lsmb end address2 ?>
 
-<?lsmb city ?> <?lsmb state ?> <?lsmb zipcode ?>
+<?lsmb zipcode ?> <?lsmb city ?>
 
 <?lsmb if country ?>
 <?lsmb country ?>
@@ -92,9 +97,12 @@
 \textbf{F A K T U R A}
 \hfill
 \begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Dato} & <?lsmb invdate ?> \\
-  \textbf{Nummer} & <?lsmb invnumber ?> \\
-  \textbf{Kunde} & <?lsmb customer_id ?>
+  \textbf{Fakturanummer:} & <?lsmb invnumber ?> \\
+<?lsmb if businessnumber ?>
+  \textbf{CVR-nummer:} & <?lsmb businessnumber ?> \\
+<?lsmb end businessnumber ?>
+  \textbf{Fakturadato} & <?lsmb invdate ?> \\
+  \textbf{Forfaldsdato} & <?lsmb duedate ?>
 \end{tabular}
 
 \vspace{1cm}
@@ -141,7 +149,8 @@
 }
 
 \vfill
-\centerline{\textbf{Tak for handelen!}}
+\centerline{\textbf{Indbetaling bedes ske til Merkur Andelskasse på konto 8401-1036773.}}
+\centerline{\textbf{(Internationalt: SWIFT/BIC RIBADK22, IBAN: DK1784010001036773)}}
 
 \renewcommand{\thefootnote}{\fnsymbol{footnote}}