From: Bernd Blessmann <bibi@online.de>
Date: Mon, 24 Oct 2011 11:03:52 +0000 (+0200)
Subject: Vorlagensätze nach mastertemplates in eigene Verzeichnisse verschoben.
X-Git-Tag: release-2.7.0beta1~155^2~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4af0c21e792126af41ef97938a95671f648bde4a;p=kivitendo-erp.git

Vorlagensätze nach mastertemplates in eigene Verzeichnisse verschoben.
---

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 2472f6c6c..276ae208b 100755
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -425,27 +425,25 @@ sub edit_user_form {
   opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO");
   my @all     = readdir(TEMPLATEDIR);
   my @alldir  = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all;
-  my @allhtml = sort grep { -f ($::lx_office_conf{paths}->{templates} . "/$_") &&  /\.html$/ } @all;
   closedir TEMPLATEDIR;
 
   @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
-  @alldir = grep !/^(webpages|\.svn)$/, @alldir;
-
-  @allhtml = reverse grep !/Default/, @allhtml;
-  push @allhtml, 'Default';
-  @allhtml = reverse @allhtml;
+  @alldir = grep !/^(webpages|mstertemplates|\.svn)$/, @alldir;
 
   $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ];
 
-  my $lastitem = $allhtml[0];
-  $lastitem =~ s/-.*//g;
-  $form->{ALL_MASTER_TEMPLATES} = [ { "name" => $lastitem, "selected" => $lastitem eq "German" } ];
-  foreach my $item (@allhtml) {
-    $item =~ s/-.*//g;
-    next if ($item eq $lastitem);
+  # mastertemplates
+  opendir TEMPLATEDIR, "$::lx_office_conf{paths}->{templates}/mastertemplates" or $form->error("$::lx_office_conf{paths}->{templates}/mastertemplates" . " : $ERRNO");
+  my @allmaster = readdir(TEMPLATEDIR);
+  closedir TEMPLATEDIR;
+
+  @allmaster  = sort grep { -d ("$::lx_office_conf{paths}->{templates}/mastertemplates" . "/$_") && !/^\.\.?$/ } @allmaster;
+  @allmaster = reverse grep !/Default/, @allmaster;
+  push @allmaster, 'Default';
+  @allmaster = reverse @allmaster;
 
+  foreach my $item (@allmaster) {
     push @{ $form->{ALL_MASTER_TEMPLATES} }, { "name" => $item, "selected" => $item eq "German" };
-    $lastitem = $item;
   }
 
   # css dir has styles that are not intended as general layouts.
@@ -541,16 +539,17 @@ sub save_user {
       umask(007);
 
       # copy templates to the directory
-      opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO");
-      my @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|odt|xml|txb)$/,
+      my $templatedir = "$::lx_office_conf{paths}->{templates}/mastertemplates/$form->{mastertemplates}";
+
+      opendir TEMPLATEDIR, $templatedir or $form->error($templatedir . " : $ERRNO");
+      my @templates = grep /.*?\.(html|tex|sty|odt|xml|txb)$/,
         readdir TEMPLATEDIR;
       closedir TEMPLATEDIR;
 
       foreach my $file (@templates) {
-        open(TEMP, "<", $::lx_office_conf{paths}->{templates} . "/$file")
-          or $form->error($::lx_office_conf{paths}->{templates} . "/$file : $ERRNO");
+        open(TEMP, "<", $templatedir . "/$file")
+          or $form->error($templatedir . "/$file : $ERRNO");
 
-        $file =~ s/\Q$form->{mastertemplates}\E-//;
         open(NEW, ">", "$form->{templates}/$file")
           or $form->error("$form->{templates}/$file : $ERRNO");
 
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
index 95cd087d1..31ccd435a 100644
--- a/doc/INSTALL.html
+++ b/doc/INSTALL.html
@@ -3,7 +3,7 @@
 <title>Lx-Office Installationsanleitung</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="Lx-Office Installationsanleitung">
-<meta name="generator" content="makeinfo 4.13">
+<meta name="generator" content="makeinfo 4.11">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <meta http-equiv="Content-Style-Type" content="text/css">
@@ -22,7 +22,7 @@
 <body>
 <h1 class="settitle">Lx-Office Installationsanleitung</h1>
    <div class="contents">
-<h2>Inhaltsverzeichnis</h2>
+<h2>Table of Contents</h2>
 <ul>
 <li><a name="toc_Top" href="#Top">Inhalt der Anleitung</a>
 <li><a name="toc_Aktuelle-Hinweise" href="#Aktuelle-Hinweise">1 Aktuelle Hinweise</a>
@@ -77,8 +77,8 @@
 
 
 <div class="node">
-<a name="Top"></a>
 <p><hr>
+<a name="Top"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Aktuelle-Hinweise">Aktuelle Hinweise</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
@@ -102,8 +102,8 @@ aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
 <!--  -->
 <div class="node">
-<a name="Aktuelle-Hinweise"></a>
 <p><hr>
+<a name="Aktuelle-Hinweise"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Ben_00c3_00b6tigte-Software-und-Pakete">Benötigte Software und Pakete</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Top">Top</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -124,9 +124,9 @@ aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Ben%c3%b6tigte-Software-und-Pakete"></a>
 <a name="Ben_00c3_00b6tigte-Software-und-Pakete"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Aktuelle-Hinweise">Aktuelle Hinweise</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -141,8 +141,8 @@ aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 </ul>
 
 <div class="node">
-<a name="Betriebssystem"></a>
 <p><hr>
+<a name="Betriebssystem"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Pakete">Pakete</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Ben_00c3_00b6tigte-Software-und-Pakete">Benötigte Software und Pakete</a>
 
@@ -181,7 +181,7 @@ installieren sind. Dafür sollte es kurz nach dem Release ein eigenes .deb
 geben.
 
    <p>Alternativ dazu kann die normale Installation durchgeführt werden
-(see <a href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>), wenn vorher ein
+(siehe <a href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>), wenn vorher ein
 Kompatibilitätspaket installiert wird, das die fehlenden Pakete bereitstellt. 
 Das Paket ist auf <a href="https://sourceforge.net/projects/lx-office/files/Lx-Office%20ERP/2.6.2/">Sourceforge</a> unter dem Namen <code>lx-erp-perl-libs-compat-v2.tar.gz</code> hinterlegt.
 
@@ -193,11 +193,11 @@ Das Paket ist auf <a href="https://sourceforge.net/projects/lx-office/files/Lx-O
 
    <p><code>libbit-vector-perl libsub-exporter-perl libclone-perl libclass-factory-util-perl</code>
 
-   <p>Danach sollte der Installationscheck (see <a href="#Pakete">Pakete</a>) die enthaltenen Pakete erkennen.
+   <p>Danach sollte der Installationscheck (siehe <a href="#Pakete">Pakete</a>) die enthaltenen Pakete erkennen.
 
 <div class="node">
-<a name="Pakete"></a>
 <p><hr>
+<a name="Pakete"></a>
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Betriebssystem">Betriebssystem</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Ben_00c3_00b6tigte-Software-und-Pakete">Benötigte Software und Pakete</a>
 
@@ -272,8 +272,8 @@ benötigten Perl-Module installiert sind. Der Aufruf lautet wie folgt:
 
 <!--  -->
 <div class="node">
-<a name="Manuelle-Installation-des-Programmpaketes"></a>
 <p><hr>
+<a name="Manuelle-Installation-des-Programmpaketes"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Anpassung-der-PostgreSQL_002dKonfiguration">Anpassung der PostgreSQL-Konfiguration</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Ben_00c3_00b6tigte-Software-und-Pakete">Benötigte Software und Pakete</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -317,9 +317,9 @@ jeden neuen Benutzer, der in lx-office angelegt wird, anlegen dürfen:
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Anpassung-der-PostgreSQL-Konfiguration"></a>
 <a name="Anpassung-der-PostgreSQL_002dKonfiguration"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Apache_002dKonfiguration">Apache-Konfiguration</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -338,9 +338,9 @@ aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 </ul>
 
 <div class="node">
+<p><hr>
 <a name="Zeichens%c3%a4tze%2fdie-Verwendung-von-UTF-8"></a>
 <a name="Zeichens_00c3_00a4tze_002fdie-Verwendung-von-UTF_002d8"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#g_t_00c3_0084nderungen-an-Konfigurationsdateien">Änderungen an Konfigurationsdateien</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Anpassung-der-PostgreSQL_002dKonfiguration">Anpassung der PostgreSQL-Konfiguration</a>
 
@@ -374,9 +374,9 @@ Lx-Office mit ISO-8859-15 als Encoding betrieben werden.
    <p>Das Encoding einer Datenbank kann in <code>psql</code> mit <code>\l</code> geprüft werden.
 
 <div class="node">
+<p><hr>
 <a name="%c3%84nderungen-an-Konfigurationsdateien"></a>
 <a name="g_t_00c3_0084nderungen-an-Konfigurationsdateien"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Erweiterung-f_00c3_00bcr-servergespeicherte-Prozeduren">Erweiterung für servergespeicherte Prozeduren</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Zeichens_00c3_00a4tze_002fdie-Verwendung-von-UTF_002d8">Zeichensätze/die Verwendung von UTF-8</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Anpassung-der-PostgreSQL_002dKonfiguration">Anpassung der PostgreSQL-Konfiguration</a>
@@ -414,9 +414,9 @@ host    all         lxoffice      127.0.0.1         255.255.255.255    password<
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Erweiterung-f%c3%bcr-servergespeicherte-Prozeduren"></a>
 <a name="Erweiterung-f_00c3_00bcr-servergespeicherte-Prozeduren"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Datenbankbenutzer-anlegen">Datenbankbenutzer anlegen</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#g_t_00c3_0084nderungen-an-Konfigurationsdateien">Änderungen an Konfigurationsdateien</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Anpassung-der-PostgreSQL_002dKonfiguration">Anpassung der PostgreSQL-Konfiguration</a>
@@ -445,8 +445,8 @@ unter <code>/usr/lib/postgresql/lib/plpgsql.so</code>.
 
 <!--  -->
 <div class="node">
-<a name="Datenbankbenutzer-anlegen"></a>
 <p><hr>
+<a name="Datenbankbenutzer-anlegen"></a>
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Erweiterung-f_00c3_00bcr-servergespeicherte-Prozeduren">Erweiterung für servergespeicherte Prozeduren</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Anpassung-der-PostgreSQL_002dKonfiguration">Anpassung der PostgreSQL-Konfiguration</a>
 
@@ -468,9 +468,9 @@ bzw. den hier gewählten Benutzernamen.
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Apache-Konfiguration"></a>
 <a name="Apache_002dKonfiguration"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Der-Task_002dServer">Der Task-Server</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Anpassung-der-PostgreSQL_002dKonfiguration">Anpassung der PostgreSQL-Konfiguration</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -524,9 +524,9 @@ folgende Option in die Konfiguration aufzunehmen:
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Der-Task-Server"></a>
 <a name="Der-Task_002dServer"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Apache_002dKonfiguration">Apache-Konfiguration</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -549,9 +549,9 @@ Rechnungen benutzt, wird aber in Zukunft deutlich mehr Aufgaben
 </ul>
 
 <div class="node">
+<p><hr>
 <a name="Konfiguration-des-Task-Servers"></a>
 <a name="Konfiguration-des-Task_002dServers"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Prozesskontrolle">Prozesskontrolle</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Der-Task_002dServer">Der Task-Server</a>
 
@@ -565,14 +565,14 @@ sind:
 
      <ul>
 <li><code>login</code>: gültiger Lx-Office-Benutzername, der benutzt wird, um die zu verwendende Datenbankverbindung auszulesen. Der Benutzer muss in der Administration angelegt werden. Diese Option muss angegeben werden. 
-<li><code>run_as</code>: Wird der Server vom Systembenutzer <code>root</code> gestartet, so wechselt er auf den mit <code>run_as</code> angegebenen Systembenutzer. Der Systembenutzer muss dieselben Lese- und Schreibrechte haben, wie auch der Webserverbenutzer (siehe see <a href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>). Daher ist es sinnvoll, hier denselben Systembenutzer einzutragen, unter dem auch der Webserver läuft. 
+<li><code>run_as</code>: Wird der Server vom Systembenutzer <code>root</code> gestartet, so wechselt er auf den mit <code>run_as</code> angegebenen Systembenutzer. Der Systembenutzer muss dieselben Lese- und Schreibrechte haben, wie auch der Webserverbenutzer (siehe siehe <a href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>). Daher ist es sinnvoll, hier denselben Systembenutzer einzutragen, unter dem auch der Webserver läuft. 
 <li><code>debug</code>: Schaltet Debug-Informationen an und aus. 
 </ul>
 
 <div class="node">
+<p><hr>
 <a name="Einbinden-in-den-Boot-Prozess"></a>
 <a name="Einbinden-in-den-Boot_002dProzess"></a>
-<p><hr>
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Prozesskontrolle">Prozesskontrolle</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Der-Task_002dServer">Der Task-Server</a>
 
@@ -625,8 +625,8 @@ Datei den Pfad zum Task-Server an (Zeile <code>exec ....</code>).
 <code>service lx-office-task-server start</code>
 
 <div class="node">
-<a name="Prozesskontrolle"></a>
 <p><hr>
+<a name="Prozesskontrolle"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Einbinden-in-den-Boot_002dProzess">Einbinden in den Boot-Prozess</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Konfiguration-des-Task_002dServers">Konfiguration des Task-Servers</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Der-Task_002dServer">Der Task-Server</a>
@@ -655,8 +655,8 @@ Runlevel-Scripte benutzt werden (siehe oben).
 
 <!--  -->
 <div class="node">
-<a name="Benutzerauthentifizierung-und-Administratorpasswort"></a>
 <p><hr>
+<a name="Benutzerauthentifizierung-und-Administratorpasswort"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Der-Task_002dServer">Der Task-Server</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -679,8 +679,8 @@ die Verwaltung von Gruppen und weitere Einstellungen
 
 <!--  -->
 <div class="node">
-<a name="Grundlagen-zur-Benutzerauthentifizierung"></a>
 <p><hr>
+<a name="Grundlagen-zur-Benutzerauthentifizierung"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Administratorpasswort">Administratorpasswort</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>
 
@@ -711,8 +711,8 @@ v2.6.0 angelegt werden. Eine Beispielkonfigurationsdatei
 benutzt werden kann.
 
 <div class="node">
-<a name="Administratorpasswort"></a>
 <p><hr>
+<a name="Administratorpasswort"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Authentifizierungsdatenbank">Authentifizierungsdatenbank</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Grundlagen-zur-Benutzerauthentifizierung">Grundlagen zur Benutzerauthentifizierung</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>
@@ -727,8 +727,8 @@ mehr im Administrationsinterface selber geändert werden. Der Parameter dazu
 heißt <code>$self-&gt;{admin_password}</code>.
 
 <div class="node">
-<a name="Authentifizierungsdatenbank"></a>
 <p><hr>
+<a name="Authentifizierungsdatenbank"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Passwort_00c3_00bcberpr_00c3_00bcfung">Passwortüberprüfung</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Administratorpasswort">Administratorpasswort</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>
@@ -753,9 +753,9 @@ Parameter anzugeben:
 automatisch anlegen (mehr dazu siehe unten).
 
 <div class="node">
+<p><hr>
 <a name="Passwort%c3%bcberpr%c3%bcfung"></a>
 <a name="Passwort_00c3_00bcberpr_00c3_00bcfung"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Name-des-Session_002dCookies">Name des Session-Cookies</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Authentifizierungsdatenbank">Authentifizierungsdatenbank</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>
@@ -797,9 +797,9 @@ den LDAP-Server in <code>$self-&gt;{LDAP_config}</code> angegeben werden:
 </ul>
 
 <div class="node">
+<p><hr>
 <a name="Name-des-Session-Cookies"></a>
 <a name="Name-des-Session_002dCookies"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Anlegen-der-Authentifizierungsdatenbank">Anlegen der Authentifizierungsdatenbank</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Passwort_00c3_00bcberpr_00c3_00bcfung">Passwortüberprüfung</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>
@@ -817,8 +817,8 @@ Parameter <code>$self-&gt;{cookie_name}</code> gesetzt.
 existiert.
 
 <div class="node">
-<a name="Anlegen-der-Authentifizierungsdatenbank"></a>
 <p><hr>
+<a name="Anlegen-der-Authentifizierungsdatenbank"></a>
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Name-des-Session_002dCookies">Name des Session-Cookies</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>
 
@@ -836,9 +836,9 @@ sein sollte:
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Benutzer--und-Gruppenverwaltung"></a>
 <a name="Benutzer_002d-und-Gruppenverwaltung"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Drucken-mit-Lx_002dOffice">Drucken mit Lx-Office</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Benutzerauthentifizierung-und-Administratorpasswort">Benutzerauthentifizierung und Administratorpasswort</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -866,9 +866,9 @@ unter folgender URL finden:
 </ul>
 
 <div class="node">
+<p><hr>
 <a name="Zusammenh%c3%a4nge"></a>
 <a name="Zusammenh_00c3_00a4nge"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Datenbanken-anlegen">Datenbanken anlegen</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>
 
@@ -915,8 +915,8 @@ angelegt werden sollten, lautet:
         </ol>
 
 <div class="node">
-<a name="Datenbanken-anlegen"></a>
 <p><hr>
+<a name="Datenbanken-anlegen"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Gruppen-anlegen">Gruppen anlegen</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Zusammenh_00c3_00a4nge">Zusammenhänge</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>
@@ -944,8 +944,8 @@ kann. Auch die Authentifizierungsdatenbank muss mit diesem Zeichensatz
 angelegt worden sein.
 
 <div class="node">
-<a name="Gruppen-anlegen"></a>
 <p><hr>
+<a name="Gruppen-anlegen"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Benutzer-anlegen">Benutzer anlegen</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Datenbanken-anlegen">Datenbanken anlegen</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>
@@ -964,8 +964,8 @@ Authentifizierungsdatenbank gespeichert werden. Sie gelten für alle
 Datenbanken, die in dieser Installation verwaltet werden.
 
 <div class="node">
-<a name="Benutzer-anlegen"></a>
 <p><hr>
+<a name="Benutzer-anlegen"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Gruppenmitgliedschaften-verwalten">Gruppenmitgliedschaften verwalten</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Gruppen-anlegen">Gruppen anlegen</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>
@@ -988,8 +988,8 @@ aktiv, so ist das Passwort-Feld deaktiviert.
 angelegten Datenbanken eingetragen werden.
 
 <div class="node">
-<a name="Gruppenmitgliedschaften-verwalten"></a>
 <p><hr>
+<a name="Gruppenmitgliedschaften-verwalten"></a>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Migration-alter-Installationen">Migration alter Installationen</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Benutzer-anlegen">Benutzer anlegen</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>
@@ -1012,8 +1012,8 @@ ausgewählten Spalte hinzugefügt.
         </ol>
 
 <div class="node">
-<a name="Migration-alter-Installationen"></a>
 <p><hr>
+<a name="Migration-alter-Installationen"></a>
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Gruppenmitgliedschaften-verwalten">Gruppenmitgliedschaften verwalten</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>
 
@@ -1041,9 +1041,9 @@ wieder anmelden und mit dem System arbeiten.
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Drucken-mit-Lx-Office"></a>
 <a name="Drucken-mit-Lx_002dOffice"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#OpenDocument_002dVorlagen">OpenDocument-Vorlagen</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Benutzer_002d-und-Gruppenverwaltung">Benutzer- und Gruppenverwaltung</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -1088,9 +1088,9 @@ darf.
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="OpenDocument-Vorlagen"></a>
 <a name="OpenDocument_002dVorlagen"></a>
-<p><hr>
 n&auml;chstes:&nbsp;<a rel="next" accesskey="n" href="#Lx_002dOffice-ERP-verwenden">Lx-Office ERP verwenden</a>,
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#Drucken-mit-Lx_002dOffice">Drucken mit Lx-Office</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
@@ -1140,7 +1140,7 @@ Python-UNO-Bindings benötigt, die Bestandteil von OpenOffice 2 sind.
 Dokument OpenOffice neu gestartet und die Konvertierung mit Hilfe
 eines Makros durchgeführt. Dieses Makro muss in der Dokumentenvorlage
 enthalten sein und &ldquo;Standard.Conversion.ConvertSelfToPDF()&rdquo;
-heißen. Die Beispielvorlage &lsquo;<samp><span class="samp">templates/German-invoice.odt</span></samp>&rsquo;
+heißen. Die Beispielvorlage &lsquo;<samp><span class="samp">templates/mastertemplates/German/invoice.odt</span></samp>&rsquo;
 enthält ein solches Makro, das in jeder anderen Dokumentenvorlage
 ebenfalls enthalten sein muss.
 
@@ -1156,14 +1156,14 @@ folgender Befehl auszuführen:
 
    <p>Dieses Verzeichnis, wie auch das komplette <code>users</code>-Verzeichnis, muss vom
 Webserver beschreibbar sein. Dieses wurde bereits erledigt
-(see <a href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>), kann aber erneut überprüft
+(siehe <a href="#Manuelle-Installation-des-Programmpaketes">Manuelle Installation des Programmpaketes</a>), kann aber erneut überprüft
 werden, wenn die Konvertierung nach PDF fehlschlägt.
 
 <!--  -->
 <div class="node">
+<p><hr>
 <a name="Lx-Office-ERP-verwenden"></a>
 <a name="Lx_002dOffice-ERP-verwenden"></a>
-<p><hr>
 voriges:&nbsp;<a rel="previous" accesskey="p" href="#OpenDocument_002dVorlagen">OpenDocument-Vorlagen</a>,
 aufw&auml;rts:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
diff --git a/doc/INSTALL.texi b/doc/INSTALL.texi
index 56d47ddc7..785f25cdf 100644
--- a/doc/INSTALL.texi
+++ b/doc/INSTALL.texi
@@ -890,7 +890,7 @@ Ist @code{$openofficeorg_daemon} nicht gesetzt, so wird für jedes
 Dokument OpenOffice neu gestartet und die Konvertierung mit Hilfe
 eines Makros durchgeführt. Dieses Makro muss in der Dokumentenvorlage
 enthalten sein und ``Standard.Conversion.ConvertSelfToPDF()''
-heißen. Die Beispielvorlage @samp{templates/German-invoice.odt}
+heißen. Die Beispielvorlage @samp{templates/mastertemplates/German/invoice.odt}
 enthält ein solches Makro, das in jeder anderen Dokumentenvorlage
 ebenfalls enthalten sein muss.
 
diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
index 2e08f0c14..3539c127e 100644
--- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt
@@ -1,5 +1,5 @@
-Inhaltsverzeichnis
-******************
+Table of Contents
+*****************
 
 Inhalt der Anleitung
 1 Aktuelle Hinweise
@@ -837,9 +837,9 @@ benötigt, die Bestandteil von OpenOffice 2 sind.
 Dokument OpenOffice neu gestartet und die Konvertierung mit Hilfe eines
 Makros durchgeführt. Dieses Makro muss in der Dokumentenvorlage
 enthalten sein und "Standard.Conversion.ConvertSelfToPDF()" heißen. Die
-Beispielvorlage `templates/German-invoice.odt' enthält ein solches
-Makro, das in jeder anderen Dokumentenvorlage ebenfalls enthalten sein
-muss.
+Beispielvorlage `templates/mastertemplates/German/invoice.odt' enthält
+ein solches Makro, das in jeder anderen Dokumentenvorlage ebenfalls
+enthalten sein muss.
 
    Als letztes muss herausgefunden werden, welchen Namen OpenOffice.org
 Writer dem Verzeichnis mit den Benutzereinstellungen gibt. Unter Debian
diff --git a/doc/changelog b/doc/changelog
index d044bcaa1..23fe6ab4c 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -23,6 +23,9 @@
 - Buchungsjournal um Filter nach Bearbeiter und Buchungsdatum (ungleich
   Rechnungsdatum) erweitert
 
+- Mastertemplates für den Ausdruck sind in eigene Unterverzeichnisse gewandert.
+  Dadurch wird das Hinzufügen neuer Vorlagensätze einfacher.
+
 
   Kleinere neue Features und Detailverbesserungen:
   - á (LATIN SMALL LETTER A WITH ACUTE) wird in Latex-Vorlagen nicht mehr durch
diff --git a/templates/Default-balance_sheet.html b/templates/Default-balance_sheet.html
deleted file mode 100644
index 478caabca..000000000
--- a/templates/Default-balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>BALANCE SHEET
-<br><%period%>
-</h2>
-
-<table border=0>
-<tr>
-  <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align=right><%asset_this_period%></td>
-  <td align=right><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL ASSETS</th>
-  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
-  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align=right><%liability_this_period%></td>
-  <td align=right><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Liabilities</th>
-  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align=right><%equity_this_period%></td>
-  <td align=right><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Equity</th>
-  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/Default-bin_list.html b/templates/Default-bin_list.html
deleted file mode 100644
index feed5696b..000000000
--- a/templates/Default-bin_list.html
+++ /dev/null
@@ -1,181 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	    <h4>
-	    <%company%>
-	    <br><%address%>
-	    </h4>
-	  </td>
-	  
-	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
-	  <th align=right>
-	    <h4>
-	    Tel: <%tel%>
-	    <br>Fax: <%fax%>
-	    </h4>
-	  </td>
-	</tr>
-	
-	<tr>
-	  <th colspan=3>
-	    <h4>B I N &nbsp;&nbsp; L I S T</h4>
-	  </th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% cellspacing=0 cellpadding=0>
-	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>From</th>
-	  <th align=left width=50%><font color=ffffff>Ship To</th>
-	</tr>
-
-	<tr valign=top>
-	  <td><%name%>
-	  <br><%street%>
-	  <br><%zipcode%>
-	  <br><%city%>
-	  <br><%country%>
-	  <br>
-
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
-
-	  <%if vendorphone%>
-	  <br>Tel: <%vendorphone%>
-	  <%end vendorphone%>
-
-	  <%if vendorfax%>
-	  <br>Fax: <%vendorfax%>
-	  <%end vendorfax%>
-
-	  <%if email%>
-	  <br><%email%>
-	  <%end email%>
-	  
-	  </td>
-	  
-	  <td><%shiptoname%>
-	  <br><%shiptostreet%>
-	  <br><%shiptozipcode%>
-	  <br><%shiptocity%>
-	  <br><%shiptocountry%>
-
-	  <br>
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
-	  
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
-
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr height=5></tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% border=1>
-	<tr>
-	  <th width=17% align=left nowrap>Order #</th>
-	  <th width=17% align=left nowrap>Date</th>
-	  <th width=17% align=left nowrap>Contact</th>
-	  <%if warehouse%>
-	  <th width=17% align=left nowrap>Warehouse</th>
-	  <%end warehouse%>
-	  <th width=17% align=left>Shipping Point</th>
-	  <th width=15% align=left>Ship via</th>
-	</tr>
-
-	<tr>
-	  <td><%ordnumber%>&nbsp;</td>
-	  
-	  <%if shippingdate%>
-	  <td><%shippingdate%></td>
-	  <%end shippingdate%>
-	  
-	  <%if not shippingdate%>
-	  <td><%orddate%></td>
-	  <%end shippingdate%>
-	  
-	  <td><%employee%>&nbsp;</td>
-
-	  <%if warehouse%>
-	  <td><%warehouse%></td>
-	  <%end warehouse%>
-  
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100%>
-	<tr bgcolor=000000>
-	  <th align=left><font color=ffffff>Pos</th>
-	  <th align=left><font color=ffffff>Number</th>
-	  <th align=left><font color=ffffff>Description</th>
-	  <th><font color=ffffff>Serialnumber</th>
-	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Qty</th>
-	  <th><font color=ffffff>Recd</th>
-	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Bin</th>
-	</tr>
-
-	<%foreach number%>
-	<tr valign=top>
-	  <td><%runningnumber%></td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td><%serialnumber%></td>
-	  <td><%deliverydate%></td>
-	  <td align=right><%qty%></td>
-	  <td align=right><%ship%></td>
-	  <td><%unit%></td>
-	  <td><%bin%></td>
-	</tr>
-	<%end number%>
-
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td><hr noshade></td>
-  </tr>
-
-</table>
-
diff --git a/templates/Default-bin_list.tex b/templates/Default-bin_list.tex
deleted file mode 100644
index b7cc8cf3a..000000000
--- a/templates/Default-bin_list.tex
+++ /dev/null
@@ -1,128 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{%
-    <%company%>
-    
-    <%address%>
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Telephone & <%tel%>\\
-  Facsimile & <%fax%>
-  \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
- 
-<%pagebreak 90 27 37%>
-\end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-\textbf{From}
-\vspace{0.7cm}
-
-<%name%> \\
-<%street%> \\
-<%zipcode%> \\
-<%city%> \\
-<%country%>
-}
-\parbox[t]{.4\textwidth}{
-\textbf{Ship To}
-\vspace{0.7cm}
-
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{B I N} \parbox{0.3cm}{\hfill} \textbf{L I S T}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
-  <%if warehouse%>
-  & \textbf{Warehouse}
-  <%end warehouse%>
-  & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
-  \hline
-  
-  <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%orddate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
-  
-\vspace{1cm}
-  
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
-
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
-  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabularx}
-
-
-\rule{\textwidth}{2pt}
-
-\end{document}
-
diff --git a/templates/Default-check.tex b/templates/Default-check.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/Default-check.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
-  & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/Default-income_statement.html b/templates/Default-income_statement.html
deleted file mode 100644
index e9d6a4002..000000000
--- a/templates/Default-income_statement.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>INCOME STATEMENT
-<br><%period%>
-</h2>
-
-
-<table width=100% border=0>
-<tr>
-  <th width=400 align=left colspan=2>INCOME<br><hr width=300 size=5 align=left noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach income_account%>
-<tr>
-  <td width=4> </td>
-  <td><%income_account%></td>
-  <td align=right><%income_this_period%></td>
-  <td align=right><%income_last_period%></td>
-</tr>
-<%end income_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td> </td>
-  <th align=left>Total Income</th>
-  <td align=right><%total_income_this_period%><hr noshade size=2></td>
-  <td align=right><%total_income_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=2>EXPENSES<br><hr width=300 size=5 align=left noshade></th>
-</tr>
-
-<%foreach expense_account%>
-<tr>
-  <td> </td>
-  <td><%expense_account%></td>
-  <td align=right><%expenses_this_period%></td>
-  <td align=right><%expenses_last_period%></td>
-</tr>
-<%end expense_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td> </td>
-  <th align=left>Total Expenses</th>
-  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>INCOME / (LOSS)</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-
-</table>
-
-
-
-
-
-
-
-
diff --git a/templates/Default-invoice.html b/templates/Default-invoice.html
deleted file mode 100644
index b44981bce..000000000
--- a/templates/Default-invoice.html
+++ /dev/null
@@ -1,309 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telephone: <%tel%>
-      <br>Facsimile: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>I N V O I C E</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Invoice Date</th><td width=10>&nbsp;</td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Due Date</th><td width=10>&nbsp;</td><td><%duedate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Number</th><td>&nbsp;</td><td><%invnumber%></td></tr>
-    </tr>
-  
-<!--
-    <tr>
-      <th align=right>Clerk:</th><td>&nbsp;</td><td><%employee%></td>
-    </tr>
--->
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>To:</th>
-      <th align=left><font color=ffffff>Ship To:</th>
-    </tr>
-
-<!--
-     other variables which can be use:
-     contact, shiptocontact, shiptophone, shiptofax
--->
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-      
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Price</th>
-      <th><font color=ffffff>Disc</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-<!--
-you can also use netprice instead of sellprice if you
-don't want to show the discount
-netprice = sellprice - discount
--->
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-    <tr>
-<%if taxincluded%>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><%invtotal%></td>
-<%end taxincluded%>
-<%if not taxincluded%>
-      <th colspan=5 align=right>Subtotal</th>
-      <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=5 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-<%if paid%>
-    <tr>
-      <th colspan=5 align=right>Paid</th>
-      <td colspan=2 align=right>- <%paid%></td>
-    </tr>
-<%end paid%>
-
-    <tr>
-      <td colspan=3>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>Terms Net <b><%terms%></b> days</td>
-      <th colspan=2 align=right>Outstanding</th>
-      <th colspan=2 align=right><%total%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      All prices in <b><%currency%></b> Funds
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<%if paid%>
-<tr>
-  <td colspan=7>
-    <table width=60%>
-      <tr>
-        <th align=left>Payments</th>
-      </tr>
-      <tr>
-        <td colspan=4>
-	  <hr noshade>
-	</td>
-      </tr>
-      <tr>
-        <th align=left>Date</th>
-	<th align=left>Account</th>
-	<th align=left>Source</th>
-	<th align=left>Amount</th>
-      </tr>
-<%end paid%>
-
-<%foreach payment%>
-      <tr>
-        <td><%paymentdate%></td>
-	<td><%paymentaccount%></td>
-	<td><%paymentsource%></td>
-	<td><%payment%></td>
-      </tr>
-<%end payment%>
-
-<%if paid%>
-    </table>
-  </td>
-</tr>
-
-<tr>
-  <td>&nbsp;</td>
-</tr>
-<%end paid%>
-
-<tr>
-  <th colspan=7>
-  <br>Thank you for your valued business!
-  </th>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Payment due NET <%terms%> Days from date of Invoice.
-    Interest on overdue amounts will acrue at the rate of 1.5% per month
-    from due date 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.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-<%foreach tax%>
-  <tr>
-    <th colspan=7 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
-  </tr>
-<%end tax%>
-
-<%if taxincluded%>
-  <tr>
-    <th colspan=7 align=left><font size=-2>Taxes shown are included in price.</th>
-  </tr>
-<%end taxincluded%>
-
-<!-- business number
-  <tr>
-    <th colspan=7 align=left><font size=-2>Business Number: <%businessnumber%></font></th>
-  </tr>
--->
-
-<!-- banking information
-  <tr>
-    <th colspan=7 align=left>Banking Information:
-    <br>Bank
-    <br>Transit No.
-    <br>Account No.
-    </td>
-  </tr>
--->
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Default-invoice.tex b/templates/Default-invoice.tex
deleted file mode 100644
index 7b74fed04..000000000
--- a/templates/Default-invoice.tex
+++ /dev/null
@@ -1,231 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%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%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-  \parbox[t]{10.5cm}{
-  \textbf{To}
-  \vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-%<%if contact%>
-%Attn: <%contact%>
-%\vspace{0.3cm}
-%<%end contact%>
-\vspace{0.5cm}
-
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\parbox[t]{7.5cm}{
-\textbf{Ship To}
-\vspace{0.5cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-Attn: <%shiptocontact%>
-\vspace{0.3cm}
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{I N V O I C E}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Number} & <%invnumber%> \\
-  \textbf{Order} & <%ordnumber%> \\
-  \textbf{Clerk} & <%employee%>
-\end{tabular}
-
-\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} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%> \\
-<%end tax%>
-<%if paid%>
-  \textbf{Paid} & - <%paid%> \\
-<%end paid%>
-  \hline
-  \textbf{Balance Owing} & \textbf{<%total%>} \\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\vfill
-
-<%if paid%>
-\begin{tabularx}{10cm}{@{}lXlr@{}}
-  \textbf{Payments} & & & \\
-  \hline
-  \textbf{Date} & \textbf{Account} & \textbf{Source} & \textbf{Amount} \\
-<%end paid%>
-<%foreach payment%>
-  <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%payment%> \\
-<%end payment%>
-<%if paid%>
-\end{tabularx}
-<%end paid%>
-
-\vspace{1cm}
-
-\centerline{\textbf{Thank You for your valued business!}}
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\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.}
-
-\end{document}
-
-
-
diff --git a/templates/Default-pick_list.html b/templates/Default-pick_list.html
deleted file mode 100644
index 365ccc161..000000000
--- a/templates/Default-pick_list.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	  <h4>
-	  <%company%>
-	  <br><%address%>
-	  </h4>
-	  </td>
-
-	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
-	  <td align=right>
-	  <h4>
-	  Tel: <%tel%>
-	  <br>Fax: <%fax%>
-	  </h4>
-	  </td>
-	</tr>
-
-	<tr>
-	  <th colspan=3>
-	    <h4>P I C K &nbsp;&nbsp; L I S T</h4>
-	  </th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% callspacing=0 cellpadding=0>
-        <tr bgcolor=000000>
-	  <th width=50% align=left><font color=ffffff>Ship To:</th>
-	  <th width=50%>&nbsp;</th>
-	</tr>
-
-	<tr valign=top>
-	  <td><%shiptoname%>
-	  <br><%shiptostreet%>
-	  <br><%shiptozipcode%>
-	  <br><%shiptocity%>
-	  <br><%shiptocountry%>
-	  </td>
-
-	  <td>
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
-
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
-
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
-
-	  <%shiptoemail%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr height=5></tr>
-  
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% border=1>
-        <tr>
-	  <th width=17% align=left>Order #</th>
-	  <th width=17% align=left>Date</th>
-	  <th width=17% align=left nowrap>Contact</th>
-	  <%if warehouse%>
-	  <th width=17% align=left>Warehouse</th>
-	  <%end warehouse%>
-	  <th width=17% align=left>Shipping Point</th>
-	  <th width=15% align=left>Ship via</th>
-	</tr>
-
-        <tr>
-	  <td><%ordnumber%>&nbsp;</td>
-
-	  <%if shippingdate%>
-	  <td><%shippingdate%></td>
-	  <%end shippingdate%>
-
-	  <%if not shippingdate%>
-	  <td><%orddate%></td>
-	  <%end shippingdate%>
-
-	  <td><%employee%>&nbsp;</td>
-	  
-	  <%if warehouse%>
-	  <td><%warehouse%>&nbsp;</td>
-	  <%end warehouse%>
-	  
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-    
-    <td>
-      <table width=100%>
-	<tr bgcolor=000000>
-	  <th align=left><font color=ffffff>Pos</th>
-	  <th align=left><font color=ffffff>Number</th>
-	  <th align=left><font color=ffffff>Description</th>
-	  <th><font color=ffffff>Qty</th>
-	  <th><font color=ffffff>Ship</th>
-	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Bin</th>
-	</tr>
-
-        <%foreach number%>
-	<tr valign=top>
-	  <td><%runningnumber%>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td align=right>[&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]</td>
-	  <td><%unit%></td>
-	  <td align=right><%bin%></td>
-	</tr>
-	<%end number%>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td><hr noshade></td>
-  </tr>
-
-</table>
-
diff --git a/templates/Default-pick_list.tex b/templates/Default-pick_list.tex
deleted file mode 100644
index e30d04c77..000000000
--- a/templates/Default-pick_list.tex
+++ /dev/null
@@ -1,142 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\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.5ex]{\textwidth}{0.5pt}
-}
-
- 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Number} & \textbf{Description} &
-  \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-  \textbf{Ship To}
-} \hfill
-
-\vspace{0.7cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-  
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
-}
-\parbox[t]{.4\textwidth}{
-  <%shiptocontact%>
-
-  <%if shiptophone%>
-  Tel: <%shiptophone%>
-  <%end shiptophone%>
-
-  <%if shiptofax%>
-  Fax: <%shiptofax%>
-  <%end shiptofax%>
-
-  <%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{P I C K} \parbox{0.3cm}{\hfill} \textbf{L I S T}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
-  <%if warehouse%>
-  & \textbf{Warehouse}
-  <%end warehouse%>
-  & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
-  \hline
-  <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%orddate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
-  
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Number} & \textbf{Description} &
-  \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> &
-  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-}
-
-\end{document}
-
diff --git a/templates/Default-purchase_order.html b/templates/Default-purchase_order.html
deleted file mode 100644
index 312ffc67d..000000000
--- a/templates/Default-purchase_order.html
+++ /dev/null
@@ -1,224 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telephone: <%tel%>
-      <br>Facsimile: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>P U R C H A S E &nbsp;&nbsp; O R D E R</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left width=50%><font color=ffffff>To:</th>
-      <th align=left width=50%><font color=ffffff>Ship To:</th>
-    </tr>
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-
-<br>
-<%if contact%>
-<br>Attn: <%contact%>
-<%end contact%>
-<%if vendorphone%>
-<br>Tel: <%vendorphone%>
-<%end vendorphone%>
-<%if vendorfax%>
-<br>Fax: <%vendorfax%>
-<%end vendorfax%>
-      </td>
-
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-
-<br>
-<%if shiptocontact%>
-<br>Attn: <%shiptocontact%>
-<%end shiptocontact%>
-<%if shiptophone%>
-<br>Tel: <%shiptophone%>
-<%end shiptophone%>
-<%if shiptofax%>
-<br>Fax: <%shiptofax%>
-<%end shiptofax%>
-
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Price</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=6><hr noshade></td>
-    </tr>
-    
-    <tr>
-      <th colspan=4 align=right>Subtotal</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=2>Terms Net <b><%terms%></b> days</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%ordtotal%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      All prices in <b><%currency%></b> Funds
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Payment due NET <%terms%> Days from date of Invoice.
-    Interest on overdue amounts will acrue at the rate of 1.5% per month
-    from due date 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.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Default-purchase_order.tex b/templates/Default-purchase_order.tex
deleted file mode 100644
index bb4c2a810..000000000
--- a/templates/Default-purchase_order.tex
+++ /dev/null
@@ -1,198 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-\textbf{To}
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-Attn: <%contact%>
-\vspace{0.3cm}
-<%end contact%>
-
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
-
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
-
-<%email%>
-}
-\parbox[t]{7.5cm}{
-\textbf{Ship To}
-\vspace{0.5cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-Attn: <%shiptocontact%>
-\vspace{0.3cm}
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{P U R C H A S E} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%orddate%> \\
-<%if reqdate%>
-  \textbf{Required by} & <%reqdate%> \\
-<%end reqdate%>
-  \textbf{Number} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-
-%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-%\footnotetext[1]{\tiny }
-
-\end{document}
-
-
diff --git a/templates/Default-receipt.tex b/templates/Default-receipt.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/Default-receipt.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
-  & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/Default-request_quotation.html b/templates/Default-request_quotation.html
deleted file mode 100644
index c1980fd04..000000000
--- a/templates/Default-request_quotation.html
+++ /dev/null
@@ -1,194 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58>
-    </td>
-
-    <td align=right>
-      <h4>
-      Tel: <%tel%>
-      <br>Fax: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>R E Q U E S T &nbsp;&nbsp; F O R &nbsp;&nbsp; Q U O T A T I O N</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left width=50%><font color=ffffff>To:</th>
-      <th align=left width=50%><font color=ffffff>Ship To:</th>
-    </tr>
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-<br>
-<%if contact%>
-<br>Attn: <%contact%>
-<%end contact%>
-<%if vendorphone%>
-<br>Tel: <%vendorphone%>
-<%end vendorphone%>
-<%if vendorfax%>
-<br>Fax: <%vendorfax%>
-<%end vendorfax%>
-      </td>
-
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-<br>
-<%if shiptocontact%>
-<br>Attn: <%shiptocontact%>
-<%end shiptocontact%>
-<%if shiptophone%>
-<br>Tel: <%shiptophone%>
-<%end shiptophone%>
-<%if shiptofax%>
-<br>Fax: <%shiptofax%>
-<%end shiptofax%>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr><td>&nbsp;</td></tr>
-  
-  <tr>
-    <td colspan=2>
-    <table width=100% border=1>
-    <tr>
-      <th width=17% align=left>RFQ #</th>
-      <th width=17% align=left>Date</th>
-      <th width=17% align=left>Required by</th>
-      <th width=17% align=left>Contact</th>
-      <th width=17% align=left>Shipping Point</th>
-      <th width=15% align=left>Ship via</th>
-    </tr>
-
-    <tr>
-      <td><%quonumber%></td>
-      <td><%quodate%></td>
-      <td><%reqdate%></td>
-      <td><%employee%></td>
-      <td><%shippingpoint%></td>
-      <td><%shipvia%></td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr height="10"></tr>
-  
-  <tr>
-    <td>Please provide price and delivery time for the following items:</td>
-  </tr>
-
-  <tr height="10"></tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr>
-<!--      <th align=right>No.</th>  -->
-      <th align=left>Number</th>
-      <th align=left>Description</th>
-      <th>Qt'y</th>
-      <th>&nbsp;</th>
-      <th>Delivery</th>
-      <th>Unit Price</th>
-      <th>Extended</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-other per line item variables available <%reqdate%>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-<%if notes%>
-    <tr valign=top>
-      <td>Notes</td>
-      <td><%notes%></td>
-    </tr>
-<%end notes%>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td width=70%>&nbsp;</td>
-
-    <td width=30%>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Default-request_quotation.tex b/templates/Default-request_quotation.tex
deleted file mode 100644
index 0f50ba17f..000000000
--- a/templates/Default-request_quotation.tex
+++ /dev/null
@@ -1,174 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{
-    <%company%>
-
-    <%address%>
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Telephone & <%tel%>\\
-  Facsimile & <%fax%>
-  \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Extended} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.45\textwidth}{
-\textbf{To}
-\vspace{0.7cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-<%contact%>
-<%end contact%>
-
-\vspace{0.2cm}
-
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
-
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
-
-<%email%>
-}
-\parbox[t]{.45\textwidth}{
-\textbf{Ship To}
-\vspace{0.7cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-<%shiptocontact%>
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{R E Q U E S T for Q U O T A T I O N}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{RFQ \#} & \textbf{Date} & \textbf{Required by} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
-  \hline
-  <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-Please provide price and delivery time for the following items:
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rllrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} & &
-  \textbf{Delivery} & \textbf{Unit Price} & \textbf{Extended} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> & <%unit%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\hfill
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\end{document}
-
diff --git a/templates/Default-sales_order.html b/templates/Default-sales_order.html
deleted file mode 100644
index 343955e28..000000000
--- a/templates/Default-sales_order.html
+++ /dev/null
@@ -1,212 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telephone: <%tel%>
-      <br>Facsimile: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>S A L E S &nbsp;&nbsp; O R D E R</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>To:</th>
-      <th align=left><font color=ffffff>Ship To:</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Price</th>
-      <th><font color=ffffff>Disc</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-    <tr>
-<%if taxincluded%>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><%ordtotal%></td>
-<%end taxincluded%>
-
-<%if not taxincluded%>
-      <th colspan=5 align=right>Subtotal</th>
-      <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=5 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=5><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>Terms Net <b><%terms%></b> days</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%ordtotal%></th>
-    </tr>
-<%if taxincluded%>
-    <tr>
-      <td colspan=3>Tax is included in Total</td>
-    </tr>
-<%end taxincluded%>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      All prices in <b><%currency%></b> Funds
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    A 10% order cancellation fee will be applied for any special order
-    products or products that have been customized, enhanced or
-    upgraded at customers request.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Default-sales_order.tex b/templates/Default-sales_order.tex
deleted file mode 100644
index 1af1b1b33..000000000
--- a/templates/Default-sales_order.tex
+++ /dev/null
@@ -1,146 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\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 <%ordnumber%>}
-
-\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 <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{S A L E S} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Order Date} & <%orddate%> \\
-<%if reqdate%>
-  \textbf{Required by} & <%reqdate%> \\
-<%end reqdate%>
-  \textbf{Number} & <%ordnumber%>
-\end{tabular}
-
-\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} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-A 10\% order cancellation fee will be applied for any special order products or
-products that have been customized, enhanced or upgraded at customers request.
-Items which are non-returnable are indicated above.
-}
-
-\end{document}
-
diff --git a/templates/Default-sales_quotation.html b/templates/Default-sales_quotation.html
deleted file mode 100644
index a77d0c624..000000000
--- a/templates/Default-sales_quotation.html
+++ /dev/null
@@ -1,221 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr valign=top>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
-    <td align=right>
-      <h4>
-      Tel: <%tel%>
-      <br>Fax: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-<tr><td colspan=3>&nbsp;</td></tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>Q U O T A T I O N</h4>
-    </th>
-  </tr>
-
-  </table>
-
-  <table width=100% callspacing=0 cellpadding=0>
-
-  <tr>
-    <td>
-    <table width=100%>
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-<br>
-<%if contact%>
-<br>Attn: <%contact%>
-<%end contact%>
-
-<%if customerphone%>
-<br>Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-<br>Fax: <%customerfax%>
-<%end customerfax%>
-
-<%if email%>
-<br><%email%>
-<%end email%>
-      </td>
-
-    </tr>
-    </table>
-    </td>
-  </tr>
-  
-  <tr><td>&nbsp;</td></tr>
-  
-  <tr>
-    <td colspan=2>
-      <table width=100% border=1>
-        <tr>
-	  <th width=17% align=left nowrap>Number</th>
-	  <th width=17% align=left>Date</th>
-	  <th width=17% align=left>Valid until</th>
-	  <th width=17% align=left nowrap>Contact</th>
-	  <th width=17% align=left nowrap>Shipping Point</th>
-	  <th width=15% align=left nowrap>Ship via</th>
-	</tr>
-
-	<tr>
-	  <td><%quonumber%></td>
-	  <td><%quodate%></td>
-	  <td><%reqdate%></td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%></td>
-	  <td><%shipvia%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=right><font color=ffffff>No.</th>
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Price</th>
-      <th><font color=ffffff>Disc</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-    <td align=right><%runningnumber%></td>
-
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=8><hr noshade></td>
-    </tr>
-    
-    <tr>
-<%if taxincluded%>
-      <th colspan=6 align=right>Total</th>
-      <td colspan=2 align=right><%invtotal%></td>
-<%end taxincluded%>
-
-<%if not taxincluded%>
-      <th colspan=6 align=right>Subtotal</th>
-      <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=6 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=4>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=4>&nbsp;
-<%if terms%>
-      Terms Net <b><%terms%></b> days
-<%end terms%>
-      </td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%quototal%></th>
-    </tr>
-    
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      All prices in <b><%currency%></b> Funds
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td width=60%><font size=-3>
-    Special order items are subject to a 10% cancellation fee.
-    </font>
-    </td>
-    <td width=40%>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
-
diff --git a/templates/Default-sales_quotation.tex b/templates/Default-sales_quotation.tex
deleted file mode 100644
index 416b0e7d7..000000000
--- a/templates/Default-sales_quotation.tex
+++ /dev/null
@@ -1,160 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\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.5ex]{\textwidth}{0.5pt}
-}
-
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%quonumber%>}{<%company%>\hfill <%quonumber%>}
-
-\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 <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.45\textwidth}{
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-<%contact%>
-<%end contact%>
-
-\vspace{0.2cm}
-
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-
-\vspace{1cm}
-
-\textbf{Q U O T A T I O N}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{Quotation \#} & \textbf{Date} & \textbf{Valid until} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
-  \hline
-  <%quonumber%> & <%quodate%> & <%reqdate%> & <%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} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  Subtotal & <%subtotal%> \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  Total & <%quototal%>\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>}.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/Default-statement.html b/templates/Default-statement.html
deleted file mode 100644
index 441e6e0d1..000000000
--- a/templates/Default-statement.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	    <h4>
-	    <%company%>
-	    <br><%address%>
-	    </h4>
-	  </td>
-	  <th><img src=http://www.sql-ledger.org/images/sql-ledger.png border=0 width=64 height=58></th>
-	  <td align=right>
-	  <h4>
-	  Tel: <%tel%>
-	  <br>Fax: <%fax%>
-	  </h4>
-	  </td>
-	</tr>
-	<tr>
-	  <th colspan=3><h4>S T A T E M E N T</h4></th>
-	</tr>
-	<tr>
-	  <td colspan=3 align=right><%statementdate%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr valign=top>
-	  <td><%name%>
-	  <br><%street%>
-	  <br><%zipcode%>
-	  <br><%city%>
-	  <br><%country%>
-	  <br>
-<%if customerphone%>
-	  <br>Tel: <%customerphone%>
-<%end customerphone%>
-<%if customerfax%>
-	  <br>Fax: <%customerfax%>
-<%end customerfax%>
-<%if email%>
-	  <br><%email%>
-<%end email%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-        <tr>
-	  <th align=left>Invoice #</th>
-	  <th width=15%>Date</th>
-	  <th width=15%>Due</th>
-	  <th width=10%>Current</th>
-	  <th width=10%>30</th>
-	  <th width=10%>60</th>
-	  <th width=10%>90+</th>
-	</tr>
-<%foreach invnumber%>
-	<tr>
-	  <td><%invnumber%></td>
-	  <td><%invdate%></td>
-	  <td><%duedate%></td>
-	  <td align=right><%c0%></td>
-	  <td align=right><%c30%></td>
-	  <td align=right><%c60%></td>
-	  <td align=right><%c90%></td>
-	</tr>
-<%end invnumber%>
-        <tr>
-	  <td colspan=7><hr size=1></td>
-	</tr>
-	<tr>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <th align=right><%c0total%></td>
-	  <th align=right><%c30total%></td>
-	  <th align=right><%c60total%></td>
-	  <th align=right><%c90total%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td align=right>
-      <table width=50%>
-        <tr>
-	  <th>Total Outstanding</th>
-          <th align=right><%total%></th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><hr noshade></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>Please make check payable to <b><%company%></b>.
-    </td>
-  </tr>
-  <tr height=20></tr>
-</table>
-
diff --git a/templates/Default-statement.tex b/templates/Default-statement.tex
deleted file mode 100644
index 9f611b881..000000000
--- a/templates/Default-statement.tex
+++ /dev/null
@@ -1,107 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-
-      <%address%>}\hfill
-    \begin{tabular}[b]{rrr@{}}
-    Tel & <%tel%>\\
-    Fax & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-  
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-}
-\parbox[t]{7.5cm}{
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\hfill
-
-\vspace{1cm}
-
-\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} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-<%foreach invnumber%>
-  <%invnumber%> & <%invdate%> & <%duedate%> &
-  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
-\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
-\end{tabular*}
-\rule{\textwidth}{1pt}
-
-\vspace{0.5cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Total outstanding} & <%total%>
-\end{tabularx}
-
-\vfill
-
-Please make check payable to <%company%>
-
-\end{document}
-
diff --git a/templates/French-balance_sheet.html b/templates/French-balance_sheet.html
deleted file mode 100644
index 418f8766f..000000000
--- a/templates/French-balance_sheet.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>Bilan</title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>BILAN DE VÉRIFICATION
-<br><%period%>
-</h2>
-
-<table border=0>
-<tr>
-  <th align=left width=400 colspan=2>ACTIF<br><hr align=left width=250 size=5 noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align=right><%asset_this_period%></td>
-  <td align=right><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>Total Actif</th>
-  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
-  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>PASSIF<b><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align=right><%liability_this_period%></td>
-  <td align=right><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Passif</th>
-  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>BENEFICES NON DISTRIBUÉS<br><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align=right><%equity_this_period%></td>
-  <td align=right><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Capital</th>
-  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL PASSIF & CAPITAL</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/templates/French-check.tex b/templates/French-check.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/French-check.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
-  & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/French-income_statement.html b/templates/French-income_statement.html
deleted file mode 100644
index 1d20875da..000000000
--- a/templates/French-income_statement.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>Compte de Résultat</title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>Compte de Résultat
-<br><%period%>
-</h2>
-
-
-<table width=100% border=0>
-<tr>
-  <th width=400 align=left colspan=2>RECETTES<br><hr width=300 size=5 align=left noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach income_account%>
-<tr>
-  <td width=4> </td>
-  <td><%income_account%></td>
-  <td align=right><%income_this_period%></td>
-  <td align=right><%income_last_period%></td>
-</tr>
-<%end income_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td> </td>
-  <th align=left>Total Recettes</th>
-  <td align=right><%total_income_this_period%><hr noshade size=2></td>
-  <td align=right><%total_income_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=2>DÉPENSES<br><hr width=300 size=5 align=left noshade></th>
-</tr>
-
-<%foreach expense_account%>
-<tr>
-  <td> </td>
-  <td><%expense_account%></td>
-  <td align=right><%expenses_this_period%></td>
-  <td align=right><%expenses_last_period%></td>
-</tr>
-<%end expense_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td> </td>
-  <th align=left>Total Dépenses</th>
-  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>BENEFICES / PERTES (en <%currency%> )</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-
-</table>
-</body>
-</html>
diff --git a/templates/French-invoice.html b/templates/French-invoice.html
deleted file mode 100644
index 6124e93ae..000000000
--- a/templates/French-invoice.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>A2A <%invnumber%> <%name%></title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-<body bgcolor="ffffff">
-
-<table width="100%">
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width="100%">
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Tél&nbsp;: <%tel%>
-      <br>Fax&nbsp;: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>F A C T U R E</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width="100%" cellspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date de facture</th><td width=10>&nbsp;</td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Date d'échéance</th><td width=10>&nbsp;</td><td><%duedate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>N° de facture</th><td>&nbsp;</td><td><%invnumber%></td></tr>
-    </tr>
-  
-<!--
-    <tr>
-      <th align=right>Correspondant</th><td>&amp;nbsp;</td><td><%employee%></td>
-    </tr>
--->
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width="100%">
-    <tr bgcolor="000000">
-      <th align=left><font color=ffffff>Adresse de facturation</font></th>
-      <th align=left><font color=ffffff>Adresse d'envoi</font></th>
-    </tr>
-
-<!--
-     d'autres variables pouvant être utilisées ici :
-     contact, shiptocontact, shiptophone, shiptofax
--->
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-      
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width="100%">
-    <tr bgcolor="000000">
-<!--      <th align=right><font color="ffffff">N°</font></th>  -->
-      <th align=left><font color="ffffff">N°</font></th>
-      <th align=left><font color="ffffff">Description</font></th>
-      <th><font color="ffffff">Qté</font></th>
-      <th>&nbsp;</th>
-      <th><font color="ffffff">Prix</font></th>
-      <th><font color="ffffff">Remise</font></th>
-      <th><font color="ffffff">Montant</font></th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-veuillez adapter le colspan si vous comptez inclure ce poste.
-ceci permettra de décaler le poste sous-total vers la gauche.
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-<!--
-vous pouvez également utiliser netprice à la place de sellprice
-si vous ne voulez pas afficher la remise
-netprice = sellprice - discount
--->
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-    <tr>
-<%if taxincluded%>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><%invtotal%></td>
-<%end taxincluded%>
-<%if not taxincluded%>
-      <th colspan=5 align=right>Sous-total</th>
-      <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=5 align=right><%taxdescription%></th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-<%if paid%>
-    <tr>
-      <th colspan=5 align=right>Déjà payé</th>
-      <td colspan=2 align=right>- <%paid%></td>
-    </tr>
-<%end paid%>
-
-    <tr>
-      <td colspan=3>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>À régler dans <b><%terms%></b> jours au plus tard.</td>
-      <th colspan=2 align=right>Solde à régler</th>
-      <th colspan=2 align=right><%total%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width="100%">
-    <tr valign=top>
-<%if notes%>
-      <td>À noter&nbsp;:</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      Tous prix indiqués en <b><%currency%></b>
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<%if paid%>
-<tr>
-  <td colspan=7>
-    <table width="60%">
-      <tr>
-        <th align=left>Détail règlements</th>
-      </tr>
-      <tr>
-        <td colspan=4>
-	  <hr noshade>
-	</td>
-      </tr>
-      <tr>
-        <th align=left>Date</th>
-	<th align=left>Compte</th>
-	<th align=left>Source</th>
-	<th align=left>Montant</th>
-      </tr>
-<%end paid%>
-
-<%foreach payment%>
-      <tr>
-        <td><%paymentdate%></td>
-	<td><%paymentaccount%></td>
-	<td><%paymentsource%></td>
-	<td><%payment%></td>
-      </tr>
-<%end payment%>
-
-<%if paid%>
-    </table>
-  </td>
-</tr>
-
-<tr>
-  <td>&nbsp;</td>
-</tr>
-<%end paid%>
-
-<tr>
-  <th colspan=7>
-  <!-- <br>Merci beaucoup&amp;nbsp;! -->
-  </th>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-  <td>
-  <table width="100%">
-  <tr valign=top>
-    <td><font size=-3>
-    &nbsp;
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-<!-- <%foreach tax%>
-  <tr>
-   <th colspan=7 align=left><font size=-2><%taxdescription%> Numéro de TVA <%taxnumber%></font></th>
-  </tr>
-<%end tax%> -->
-
-<%if taxincluded%>
-  <tr>
-    <th colspan=7 align=left><font size=-2>Les taxes affichés sont inclus dans le prix.</font></th>
-  </tr>
-<%end taxincluded%>
-
-<!-- business number
-  <tr>
-    <th colspan=7 align=left><font size=-2>Régistre de Commerce&amp;nbsp;: <%businessnumber%></font></th>
-  </tr>
--->
-
-<!-- information banquaire -->
-  <tr><td>
-  <h6><center>N° TVA&nbsp;: &nbsp;&nbsp;Banque&nbsp;: &nbsp;&nbsp;N° de compte&nbsp;: &nbsp;&nbsp;Code SWIFT&nbsp;: </center>
-  </h6>
-    </td>
-  </tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/templates/French-invoice.tex b/templates/French-invoice.tex
deleted file mode 100644
index 6d546f129..000000000
--- a/templates/French-invoice.tex
+++ /dev/null
@@ -1,151 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage[frenchb]{babel}
-\usepackage[utf8]{inputenc}
-\usepackage{tabularx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Téléphone & <%tel%>\\
-    Télécopieur & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
-  & reporté de la page <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{F A C T U R E}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date de facturation} & <%invdate%> \\
-  \textbf{Numéro de facture} & <%invnumber%> \\
-  \textbf{Numéro de client} & <%customer_id%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> de <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%total%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  Tous les prix indiqués sont en \textbf{<%currency%>}.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\vfill
-\centerline{\textbf{Merci de faire affaire avec nous!}}
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-Le paiement doit être acquitté au plus tard <%terms%> jours à partir de
-la date de facturation. Des intérêts seront perçus à raison de 1.5\% par
-mois après <%duedate%> jusqu'à ce que le paiement soit complet. Les
-éléments retournés seront sujets à un supplément de remmagasinnage de
-10\%. Une autorisation de renvoi doit être obtenue au préalable auprès de
-<%company%>. Les frais de transports et d'assurance sur les éléments
-retournés devront être couvert par le client de façon appropriée.
-<%company%> ne peut être tenue responsable des dommages survenus pendant
-le transit.}
-
-\end{document}
diff --git a/templates/French-purchase_order.html b/templates/French-purchase_order.html
deleted file mode 100644
index 52628e082..000000000
--- a/templates/French-purchase_order.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>Commande <%ordnumber%> <%name%></title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Tél&nbsp;: <%tel%>
-      <br>Fax&nbsp;: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>B O N&nbsp;&nbsp;D E&nbsp;&nbsp;C O M M A N D E</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
- <table width=100% cellspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date commande</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Requis pour</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>N° commande</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Commandé par</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>N°</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qté</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Prix</th>
-      <th><font color=ffffff>Montant</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-veuillez ajuster le colspan si vous voulez inclure ce poste pour décaler le sous-total vers la droite.
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=6><hr noshade></td>
-    </tr>
-    
-    <tr>
-      <th colspan=4 align=right>Sous-total</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=2>À régler dans <b><%terms%></b> jours au plus tard</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%total%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>À noter&nbsp;:</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      Tous prix indiqués en <b><%currency%></b>
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td>
-<!--
-<font size=-3>
-    Payment due NET <%terms%> Days from date of Invoice.
-    Interest on overdue amounts will acrue at the rate of 1.5% per month
-    from due date 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.
-    </font>
--->
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/French-purchase_order.tex b/templates/French-purchase_order.tex
deleted file mode 100644
index fabb79fdb..000000000
--- a/templates/French-purchase_order.tex
+++ /dev/null
@@ -1,143 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage[frenchb]{babel}
-\usepackage[utf8]{inputenc}
-\usepackage{tabularx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Téléphone & <%tel%>\\
-    Télécopieur & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & reporté de la page <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{B O N} \parbox{0.3cm}{\hfill} \textbf{D E} \parbox{0.3cm}{\hfill}
-\textbf{C O M M A N D E}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date de la commande} & <%orddate%> \\
-<%if reqdate%>
-  \textbf{Livrable le} & <%reqdate%> \\
-<%end reqdate%>
-  \textbf{Numéro de commande} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Montant} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> de <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  Tous les prix indiqués sont en \textbf{<%currency%>}.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-
-%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-%\footnotetext[1]{\tiny }
-
-\end{document}
diff --git a/templates/French-receipt.tex b/templates/French-receipt.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/French-receipt.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
-  & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/French-sales_order.html b/templates/French-sales_order.html
deleted file mode 100644
index 35351e12d..000000000
--- a/templates/French-sales_order.html
+++ /dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>Commande <%ordnumber%> <%name%></title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-<body bgcolor="ffffff">
-
-<table width="100%">
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width="100%">
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Tél&nbsp;: <%tel%>
-      <br>Fax&nbsp;: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>B O N&nbsp;&nbsp;&nbsp;D E&nbsp;&nbsp;&nbsp;C O M M A N D E</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% cellspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date commande</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Requis pour</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>N° commande</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width="100%">
-    <tr bgcolor="000000">
-      <th align=left><font color="ffffff">Commandé par</th>
-      <th align=left><font color="ffffff">Adresse d'envoi</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width="100%">
-    <tr bgcolor="000000">
-<!--      <th align=right><font color="ffffff">N°</th>  -->
-      <th align=left><font color="ffffff">N°</th>
-      <th align=left><font color="ffffff">Description</th>
-      <th><font color="ffffff">Qté</th>
-      <th>&nbsp;</th>
-      <th><font color="ffffff">Prix</th>
-      <th><font color="ffffff">Remise</th>
-      <th><font color="ffffff">Montant</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-    <tr>
-<%if taxincluded%>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><%ordtotal%></td>
-<%end taxincluded%>
-
-<%if not taxincluded%>
-      <th colspan=5 align=right>Sous-total</th>
-      <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=5 align=right><%taxdescription%></th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=5><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>À régler dans <b><%terms%></b> jours au plus tard</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%ordtotal%></th>
-    </tr>
-<%if taxincluded%>
-    <tr>
-      <td colspan=3>Taxe comprise dans Total</td>
-    </tr>
-<%end taxincluded%>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width="100%">
-    <tr valign=top>
-<%if notes%>
-      <td>À noter&nbsp;:</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      Tous prix indiqués en <b><%currency%></b>
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width="100%">
-  <tr valign=top>
-    <td><font size=-3>
-<!--
-    A 10% order cancellation fee will be applied for any special order
-    products or products that have been customized, enhanced or
-    upgraded at customers request.
--->
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  <tr>
-  <td colspan=5>
-    <h6><center>N° TVA&nbsp;: &nbsp;&nbsp;Banque&nbsp;: &nbsp;&nbsp;N° de compte&nbsp;: &nbsp;&nbsp;Code SWIFT&nbsp;: </center>
-      </h6>
-  </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/templates/French-sales_order.tex b/templates/French-sales_order.tex
deleted file mode 100644
index 50e4a052e..000000000
--- a/templates/French-sales_order.tex
+++ /dev/null
@@ -1,147 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage[frenchb]{babel}
-\usepackage[utf8]{inputenc}
-\usepackage{tabularx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Téléphone & <%tel%>\\
-    Télécopieur & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
-  & reporté de la page <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{C O M M A N D E} \parbox{0.3cm}{\hfill} \textbf{C L I E N T}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date de la commande} & <%orddate%> \\
-<%if reqdate%>
-  \textbf{Livrable le} & <%reqdate%> \\
-<%end reqdate%>
-  \textbf{Numéro de commande} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> de <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  Tous les prix indiqués sont en \textbf{<%currency%>}.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-Un supplément de 10% sera appliqué à toute commande spécifique et à tout
-produit adapté, amélioré ou mis-à-jour à la demande du client. Les
-éléments non-retournables sont indiqués ci-dessus.
-}
-
-\end{document}
-
diff --git a/templates/French-statement.html b/templates/French-statement.html
deleted file mode 100644
index 9ece5ede0..000000000
--- a/templates/French-statement.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>Extrait de compte pour <%name%></title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	    <h4>
-	    <%company%>
-	    <br><%address%>
-	    </h4>
-	  </td>
-	  <th></th>
-	  <td align=right>
-	  <h4>
-	  Tél&nbsp;: <%tel%>
-	  <br>Fax&nbsp;: <%fax%>
-	  </h4>
-	  </td>
-	</tr>
-	<tr>
-	  <th colspan=3><h4>E X T R A I T&nbsp;&nbsp;D E&nbsp;&nbsp;C O M P T E</h4></th>
-	</tr>
-	<tr>
-	  <td colspan=3 align=right><%statementdate%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr valign=top>
-	  <td><%name%>
-	  <br><%street%>
-	  <br><%zipcode%>
-	  <br><%city%>
-	  <br><%country%>
-	  <br>
-<%if customerphone%>
-	  <br>Tél&nbsp;: <%customerphone%>
-<%end customerphone%>
-<%if customerfax%>
-	  <br>Fax&nbsp;: <%customerfax%>
-<%end customerfax%>
-<%if email%>
-	  <br><%email%>
-<%end email%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-        <tr>
-	  <th align=left>Facture n°</th>
-	  <th width=15%>Date</th>
-	  <th width=15%>Echeance</th>
-	  <th width=10%>Actuel</th>
-	  <th width=10%>30</th>
-	  <th width=10%>60</th>
-	  <th width=10%>90+</th>
-	</tr>
-<%foreach invnumber%>
-	<tr>
-	  <td><%invnumber%></td>
-	  <td><%invdate%></td>
-	  <td><%duedate%></td>
-	  <td align=right><%c0%></td>
-	  <td align=right><%c30%></td>
-	  <td align=right><%c60%></td>
-	  <td align=right><%c90%></td>
-	</tr>
-<%end invnumber%>
-        <tr>
-	  <td colspan=7><hr size=1></td>
-	</tr>
-	<tr>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <th align=right><%c0total%></td>
-	  <th align=right><%c30total%></td>
-	  <th align=right><%c60total%></td>
-	  <th align=right><%c90total%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td align=right>
-      <table width=50%>
-        <tr>
-	  <th>Solde impayé</th>
-          <th align=right><%total%></th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><hr noshade></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>Tout paiement au nom de <b><%company%></b>
-    </td>
-  </tr>
-  <tr height=20></tr>
-</table>
-</body>
-</html>
diff --git a/templates/French-statement.tex b/templates/French-statement.tex
deleted file mode 100644
index 23ebf781e..000000000
--- a/templates/French-statement.tex
+++ /dev/null
@@ -1,137 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-
-      <%address%>}\hfill
-    \begin{tabular}[b]{rrr@{}}
-    Tel & <%tel%>\\
-    Fax & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
-
-\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}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-  
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-}
-\parbox[t]{7.5cm}{
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{S T A T E M E N T} \hfill
-
-\hfill <%statementdate%>
-
-\vspace{2cm}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-<%foreach invnumber%>
-  <%invnumber%> & <%invdate%> & <%duedate%> &
-  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
-\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
-\end{tabular*}
-\rule{\textwidth}{1pt}
-
-\vspace{1cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Total outstanding} & <%total%>
-\end{tabularx}
-
-\vfill
-
-Please make check payable to <%company%>
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-}
-
-\end{document}
-
diff --git a/templates/German-balance_sheet.html b/templates/German-balance_sheet.html
deleted file mode 100644
index 985b6eff5..000000000
--- a/templates/German-balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor="#ffffff">
-
-<h2 align="center">
-<%company%>
-<br><%address%>
-
-<p>BILANZ
-<br><%period%>
-</h2>
-
-<table border="0">
-<tr>
-  <th align="left" width="400" colspan="2">AKTIVA<br><hr align="left" width="250" size="5" noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align="right"><%asset_this_period%></td>
-  <td align="right"><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <th align="left" colspan="2">TOTAL</th>
-  <td align="right"><%total_assets_this_period%><hr noshade size="2"></td>
-  <td align="right"><%total_assets_last_period%><hr noshade size="2"></td>
-</tr>
-
-<tr>
-  <th align="left" colspan="4">PASSIVA<b><hr align="left" width="250" size="5" noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align="right"><%liability_this_period%></td>
-  <td align="right"><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <td></td>
-  <th align="left">TOTAL</th>
-  <td align="right"><%total_liabilities_this_period%><br><hr noshade size="2"</td>
-  <td align="right"><%total_liabilities_last_period%><br><hr noshade size="2"</td>
-</tr>
-
-<tr>
-  <th align="left" colspan="4">EIGENTUM<br><hr align="left" width="250" size="5" noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align="right"><%equity_this_period%></td>
-  <td align="right"><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan="2"> </td>
-  <td><hr noshade size="1"></td>
-  <td><hr noshade size="1"></td>
-</tr>
-
-<tr valign="top">
-  <td></td>
-  <th align="left">TOTAL</th>
-  <td align="right"><%total_equity_this_period%><br><hr noshade size="2"</td>
-  <td align="right"><%total_equity_last_period%><br><hr noshade size="2"</td>
-</tr>
-
-<tr valign="top">
-  <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
-  <td align="right"><%total_this_period%><br><hr noshade size="2"></td>
-  <td align="right"><%total_last_period%><br><hr noshade size="2"></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/German-bin_list.html b/templates/German-bin_list.html
deleted file mode 100644
index d57632dc7..000000000
--- a/templates/German-bin_list.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	    <h4>
-	    <%company%>
-	    <br><%address%>
-	    </h4>
-	  </td>
-	  
-	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
-	  <th align=right>
-	    <h4>
-	    Tel: <%tel%>
-	    <br>Fax: <%fax%>
-	    </h4>
-	  </td>
-	</tr>
-	
-	<tr>
-	  <th colspan=3>
-	    <h4>L A G E R L I S T E</h4>
-	  </th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% cellspacing=0 cellpadding=0>
-	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>Absender</th>
-	  <th align=left width=50%><font color=ffffff>Lieferanschrift</th>
-	</tr>
-
-	<tr valign=top>
-	  <td><%name%>
-	  <br><%street%>
-	  <br><%zipcode%>
-	  <br><%city%>
-	  <br><%country%>
-	  <br>
-
-	  <%if contact%>
-	  <br>Kontakt: <%contact%>
-	  <%end contact%>
-
-	  <%if vendorphone%>
-	  <br>Tel: <%vendorphone%>
-	  <%end vendorphone%>
-
-	  <%if vendorfax%>
-	  <br>Fax: <%vendorfax%>
-	  <%end vendorfax%>
-
-	  <%if email%>
-	  <br><%email%>
-	  <%end email%>
-	  
-	  </td>
-	  
-	  <td><%shiptoname%>
-	  <br><%shiptostreet%>
-	  <br><%shiptozipcode%>
-	  <br><%shiptocity%>
-	  <br><%shiptocountry%>
-
-	  <br>
-	  <%if shiptocontact%>
-	  <br>Kontakt: <%shiptocontact%>
-	  <%end shiptocontact%>
-	  
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
-
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr height=5></tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% border=1>
-	<tr>
-	  <th width=17% align=left nowrap>BestellNr. #</th>
-	  <th width=17% align=left nowrap>Datum</th>
-	  <th width=17% align=left nowrap>Kontakt</th>
-	  <%if warehouse%>
-	  <th width=17% align=left nowrap>Lager</th>
-	  <%end warehouse%>
-	  <th width=17% align=left>Versandort</th>
-	  <th width=15% align=left>Lieferung durch</th>
-	</tr>
-
-	<tr>
-	  <td><%ordnumber%>&nbsp;</td>
-
-	  <%if shippingdate%>
-	  <td><%shippingdate%></td>
-	  <%end shippingdate%>
-
-	  <%if not shippingdate%>
-	  <td><%orddate%></td>
-	  <%end shippingdate%>
-
-	  <td><%employee%>&nbsp;</td>
-
-	  <%if warehouse%>
-	  <td><%warehouse%></td>
-	  <%end warehouse%>
-
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100%>
-	<tr bgcolor=000000>
-	  <th align=left><font color=ffffff>Pos</th>
-	  <th align=left><font color=ffffff>ArtNr.</th>
-	  <th align=left><font color=ffffff>Beschreibung</th>
-	  <th><font color=ffffff>Seriennummer</th>
-	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Menge</th>
-	  <th><font color=ffffff>Erh</th>
-	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Lagerplatz</th>
-	</tr>
-
-	<%foreach number%>
-	<tr valign=top>
-	  <td><%runningnumber%></td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td><%serialnumber%></td>
-	  <td><%deliverydate%></td>
-	  <td align=right><%qty%></td>
-	  <td align=right><%ship%></td>
-	  <td><%unit%></td>
-	  <td><%bin%></td>
-	</tr>
-	<%end number%>
-
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td><hr noshade></td>
-  </tr>
-
-</table>
-
diff --git a/templates/German-bin_list.tex b/templates/German-bin_list.tex
deleted file mode 100644
index 91e3b9c97..000000000
--- a/templates/German-bin_list.tex
+++ /dev/null
@@ -1,128 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{%
-    <%company%>
-    
-    <%address%>
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Tel & <%tel%>\\
-  Fax & <%fax%>
-  \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
- 
-<%pagebreak 90 27 37%>
-\end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennummer} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-\textbf{Von}
-\vspace{0.7cm}
-
-<%name%> \\
-<%street%> \\
-<%zipcode%> \\
-<%city%> \\
-<%country%>
-}
-\parbox[t]{.4\textwidth}{
-\textbf{Lieferanschrift}
-\vspace{0.7cm}
-
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{L A G E R L I S T E}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
-  <%if warehouse%>
-  & \textbf{Lager}
-  <%end warehouse%>
-  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
-  \hline
-
-  <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%orddate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennumner} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
-
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
-  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabularx}
-
-
-\rule{\textwidth}{2pt}
-
-\end{document}
-
diff --git a/templates/German-bwa.html b/templates/German-bwa.html
deleted file mode 100644
index 91907d8fe..000000000
--- a/templates/German-bwa.html
+++ /dev/null
@@ -1,582 +0,0 @@
-<body>
-<style type="text/css">
-<!--
-/* Allgemeine Schriftdefinition */
-th,td {
-	font-family: Arial, Verdana, Helvetica, Sans-serif;
-	font-size:small;
-}
-
-@page {
-	size: landscape;
-	margin: 0.5cm;
-}
-
-/* Definition Tabellenueberschrift */
-
-.left	{ text-align:left; }
-.center	{ text-align:center; }
-.right	{ text-align:right; }
-
-tr.headline    { border:0; }
-tr.headline td { border:0; }
-h1 { font-size:120%; }
-h2 { font-size:100%; }
-
-/* Tabellenkopf */
-th {
-	font-weight: bold;
-	border-bottom: solid thin black;
-	padding:0 10px;
-	text-align:right;
-}
-
-th.left  { border-left:  solid thin black; }
-th.right { border-right: solid thin black; }
-
-.querkopf th.right { text-align:center; }
-.querkopf th {
-	border-top: solid thin black;
-	border-bottom:0;
-}
-
-/* Tabelleninhalt */
-td {
-	text-align:right;
-	padding:0 0.5em;
-}
-td.left  { border-left:  solid thin black; }
-td.right { border-right: solid thin black; }
-
-
-/* jede zweite Zeile grau hinterlegen */
-tr.grey {
-	background:#f0f0f0;
-}
-
-/* letzte Zeile in der Tabelle */
-#last td{ border-bottom: solid thin black; }
-
-/* Zwischensumme/-ueberschriften */
-tr.subtotal td { font-weight: bold; }
-
-/* Fusszeile unter der Tabelle */
-td.footer {
-	text-align:right;
-	font-size:smaller;
-}
-//-->
-</style>
-
-<table border=0 cellpadding=0 cellspacing=0>
-<tr class="headline">
-	<td class="left"><%company%></td>
-	<td class=center colspan="9">
-		<h1>Kurzfristige Erfolgsrechnung <%period%></h1>
-		<h2>SKR3 &nbsp; BWA</h2>
-	</td>
-	<td class="right">Blatt 1</td>
-</tr>
-	
-	
-</tr>	
-<tr class="querkopf">
-	<th class="left">&nbsp;</th>
-	<th class="center" colspan="5">Im Betrachtungszeitraum</th>
-	<th class="right" colspan="5">Kumuliert seit Jahresanfang</th>
-</tr>
-
-<tr>
-	<th class="left">Bezeichnung</th>
-	<th>Wert</th>
-	<th>% Ges.- Leistg.</th>
-	<th>% Ges.- Kosten</th>
-	<th>% Pers.- Kosten</th>
-	<th>Aufschlag</th>
-	<th>Wert</th>
-	<th>% Ges.- Leistg.</th>
-	<th>% Ges.- Kosten</th>
-	<th>% Pers.- Kosten</th>
-	<th class="right">Aufschlag</th>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Umsatzerl&ouml;se</nobr></td>
-	<td><nobr><%jetzt1%></nobr></td>
-	<td><nobr><%jetztgl1%></nobr></td>
-	<td></td>
-	<td></td>
-	<td></td>
-	<td><nobr><%kumm1%></nobr></td>
-	<td><nobr><%kummgl1%></nobr></td>
-	<td></td>
-	<td></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>Best.Verdg. FE/UE</nobr></td>
-	<td><nobr><%jetzt2%></nobr></td>
-	<td><nobr><%jetztgl2%></nobr></td>
-	<td></td>
-	<td></td>
-	<td></td>	
-	<td><nobr><%kumm2%></nobr></td>
-	<td><nobr><%kummgl2%></nobr></td>
-	<td></td>
-	<td></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Akt.Eigenleistungen</nobr></td>
-	<td><nobr><%jetzt3%></nobr></td>
-	<td><nobr><%jetztgl3%></nobr></td>
-	<td></td>
-	<td></td>
-	<td></td>
-	<td><nobr><%kumm3%></nobr></td>
-	<td><nobr><%kummgl3%></nobr></td>
-	<td></td>
-	<td></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-	
-<tr class="grey subtotal">
-	<td class="left"><nobr>Gesamtleistung</nobr></td>
-	<td><nobr><%jetztgesamtleistung%></nobr></td>
-	<td><nobr><%jetztglgesamtleistung%></nobr></td>
-	<td><nobr><%jetztgkgesamtleistung%></nobr></td>
-	<td><nobr><%jetztpkgesamtleistung%></nobr></td>
-	<td></td>
-	<td><nobr><%kummgesamtleistung%></nobr></td>
-	<td><nobr><%kummglgesamtleistung%></nobr></td>
-	<td><nobr><%kummgkgesamtleistung%></nobr></td>
-	<td><nobr><%kummpkgesamtleistung%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-	
-<tr class="grey">
-	<td class="left"><nobr>Mat./Wareneinkauf</nobr></td>
-	<td><nobr><%jetzt4%></nobr></td>
-	<td><nobr><%jetztgl4%></nobr></td>
-	<td><nobr><%jetztgk4%></nobr></td>
-	<td><nobr><%jetztpk4%></nobr></td>
-	<td><nobr><%jetztauf4%></nobr></td>
-	<td><nobr><%kumm4%></nobr></td>
-	<td><nobr><%kummgl4%></nobr></td>
-	<td><nobr><%kummgk4%></nobr></td>
-	<td><nobr><%kummpk4%></nobr></td>
-	<td class="right"><nobr><%kummauf4%></nobr>&nbsp;</td>
-</tr>
-	
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-		
-<tr class="grey subtotal">
-	<td class="left"><nobr>Rohertrag</nobr></td>
-	<td><nobr><%jetztrohertrag%></nobr></td>
-	<td><nobr><%jetztglrohertrag%></nobr></td>
-	<td><nobr><%jetztgkrohertrag%></nobr></td>
-	<td><nobr><%jetztpkrohertrag%></nobr></td>
-	<td><nobr><%jetztaufrohertrag%></nobr></td>
-	<td><nobr><%kummrohertrag%></nobr></td>
-	<td><nobr><%kummglrohertrag%></nobr></td>
-	<td><nobr><%kummgkrohertrag%></nobr></td>
-	<td><nobr><%kummpkrohertrag%></nobr></td>
-	<td class="right"><nobr><%kummaufrohertrag%></nobr>&nbsp;</td>
-</tr>
-	
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-		
-<tr class="grey">
-	<td class="left"><nobr>So.betr.Erl&ouml;se</nobr></td>
-	<td><nobr><%jetzt5%></nobr></td>
-	<td><nobr><%jetztgl5%></nobr></td>
-	<td><nobr><%jetztgk5%></nobr></td>
-	<td><nobr><%jetztpk5%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm5%></nobr></td>
-	<td><nobr><%kummgl5%></nobr></td>
-	<td><nobr><%kummgk5%></nobr></td>
-	<td><nobr><%kummpk5%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-		
-<tr class="grey subtotal">
-	<td class="left"><nobr>Betriebl. Rohertrag</nobr></td>
-	<td><nobr><%jetztbetriebrohertrag%></nobr></td>
-	<td><nobr><%jetztglbetriebrohertrag%></nobr></td>
-	<td><nobr><%jetztgkbetriebrohertrag%></nobr></td>
-	<td><nobr><%jetztpkbetriebrohertrag%></nobr></td>
-	<td><nobr><%jetztaufbetriebrohertrag%></nobr></td>
-	<td><nobr><%kummbetriebrohertrag%></nobr></td>
-	<td><nobr><%kummglbetriebrohertrag%></nobr></td>
-	<td><nobr><%kummgkbetriebrohertrag%></nobr></td>
-	<td><nobr><%kummpkbetriebrohertrag%></nobr></td>
-	<td
-class="right"><nobr><%kummaufbetriebrohertrag%></nobr>&nbsp;</td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="grey subtotal">
-	<td class="left">Kostenarten:</td>
-	<td class="right" colspan="10">&nbsp;</td>
-</tr>	
-		
-<tr class="white">
-	<td class="left"><nobr>Personalkosten</nobr></td>
-	<td><nobr><%jetzt10%></nobr></td>
-	<td><nobr><%jetztgl10%></nobr></td>
-	<td><nobr><%jetztgk10%></nobr></td>
-	<td><nobr><%jetztpk10%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm10%></nobr></td>
-	<td><nobr><%kummgl10%></nobr></td>
-	<td><nobr><%kummgk10%></nobr></td>
-	<td><nobr><%kummpk10%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Raumkosten</nobr></td>
-	<td><nobr><%jetzt11%></nobr></td>
-	<td><nobr><%jetztgl11%></nobr></td>
-	<td><nobr><%jetztgk11%></nobr></td>
-	<td><nobr><%jetztpk11%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm11%></nobr></td>
-	<td><nobr><%kummgl11%></nobr></td>
-	<td><nobr><%kummgk11%></nobr></td>
-	<td><nobr><%kummpk11%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>Betriebl.Steuern</nobr></td>
-	<td><nobr><%jetzt12%></nobr></td>
-	<td><nobr><%jetztgl12%></nobr></td>
-	<td><nobr><%jetztgk12%></nobr></td>
-	<td><nobr><%jetztpk12%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm12%></nobr></td>
-	<td><nobr><%kummgl12%></nobr></td>
-	<td><nobr><%kummgk12%></nobr></td>
-	<td><nobr><%kummpk12%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Versich./Beitr&auml;ge</nobr></td>
-	<td><nobr><%jetzt13%></nobr></td>
-	<td><nobr><%jetztgl13%></nobr></td>
-	<td><nobr><%jetztgk13%></nobr></td>
-	<td><nobr><%jetztpk13%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm13%></nobr></td>
-	<td><nobr><%kummgl13%></nobr></td>
-	<td><nobr><%kummgk13%></nobr></td>
-	<td><nobr><%kummpk13%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Kfz-Kosten (o.St.)</nobr></td>
-	<td><nobr><%jetzt14%></nobr></td>
-	<td><nobr><%jetztgl14%></nobr></td>
-	<td><nobr><%jetztgk14%></nobr></td>
-	<td><nobr><%jetztpk14%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm14%></nobr></td>
-	<td><nobr><%kummgl14%></nobr></td>
-	<td><nobr><%kummgk14%></nobr></td>
-	<td><nobr><%kummpk14%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>Werbe-/Reisekosten</nobr></td>
-	<td><nobr><%jetzt15%></nobr></td>
-	<td><nobr><%jetztgl15%></nobr></td>
-	<td><nobr><%jetztgk15%></nobr></td>
-	<td><nobr><%jetztpk15%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm15%></nobr></td>
-	<td><nobr><%kummgl15%></nobr></td>
-	<td><nobr><%kummgk15%></nobr></td>
-	<td><nobr><%kummpk15%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Kosten Warenabgabe</nobr></td>
-	<td><nobr><%jetzt16%></nobr></td>
-	<td><nobr><%jetztgl16%></nobr></td>
-	<td><nobr><%jetztgk16%></nobr></td>
-	<td><nobr><%jetztpk16%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm16%></nobr></td>
-	<td><nobr><%kummgl16%></nobr>
-</td>
-	<td><nobr><%kummgk16%></nobr></td>
-	<td><nobr><%kummpk16%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>Abschreibungen</nobr></td>
-	<td><nobr><%jetzt17%></nobr></td>
-	<td><nobr><%jetztgl17%></nobr></td>
-	<td><nobr><%jetztgk17%></nobr></td>
-	<td><nobr><%jetztpk17%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm17%></nobr></td>
-	<td><nobr><%kummgl17%></nobr></td>
-	<td><nobr><%kummgk17%></nobr></td>
-	<td><nobr><%kummpk17%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Reparatur/Instandh.</nobr></td>
-	<td><nobr><%jetzt18%></nobr></td>
-	<td><nobr><%jetztgl18%></nobr></td>
-	<td><nobr><%jetztgk18%></nobr></td>
-	<td><nobr><%jetztpk18%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm18%></nobr></td>
-	<td><nobr><%kummgl18%></nobr></td>
-	<td><nobr><%kummgk18%></nobr></td>
-	<td><nobr><%kummpk18%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>Sonstige Kosten</nobr></td>
-	<td><nobr><%jetzt20%></nobr></td>
-	<td><nobr><%jetztgl20%></nobr></td>
-	<td><nobr><%jetztgk20%></nobr></td>
-	<td><nobr><%jetztpk20%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm20%></nobr></td>
-	<td><nobr><%kummgl20%></nobr></td>
-	<td><nobr><%kummgk20%></nobr></td>
-	<td><nobr><%kummpk20%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey subtotal">
-	<td class="left"><nobr>Gesamtkosten</nobr></td>
-	<td><nobr><%jetztgesamtkosten%></nobr></td>
-	<td><nobr><%jetztglgesamtkosten%></nobr></td>
-	<td><nobr><%jetztgkgesamtkosten%></nobr></td>
-	<td><nobr><%jetztpkgesamtkosten%></nobr></td>
-	<td></td>
-	<td><nobr><%kummgesamtkosten%></nobr></td>
-	<td><nobr><%kummglgesamtkosten%></nobr></td>
-	<td><nobr><%kummgkgesamtkosten%></nobr></td>
-	<td><nobr><%kummpkgesamtkosten%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-	
-<tr class="grey subtotal">
-<td class="left"><nobr>Betriebsergebnis</nobr></td>
-	<td><nobr><%jetztbetriebsergebnis%></nobr></td>
-	<td><nobr><%jetztglbetriebsergebnis%></nobr>
-</td>
-	<td><nobr><%jetztgkbetriebsergebnis%></nobr></td>
-	<td><nobr><%jetztpkbetriebsergebnis%></nobr></td>
-	<td></td>
-	<td><nobr><%kummbetriebsergebnis%></nobr></td>
-	<td><nobr><%kummglbetriebsergebnis%></nobr>
-</td>
-	<td><nobr><%kummgkbetriebsergebnis%></nobr></td>
-	<td><nobr><%kummpkbetriebsergebnis%></nobr></td>
-	<td class="right">&nbsp;</td>
-	</tr>
-
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Zinsaufwand</nobr></td>
-	<td><nobr><%jetzt30%></nobr></td>
-	<td><nobr><%jetztgl30%></nobr></td>
-	<td><nobr><%jetztgk30%></nobr></td>
-	<td><nobr><%jetztpk30%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm30%></nobr></td>
-	<td><nobr><%kummgl30%></nobr></td>
-	<td><nobr><%kummgk30%></nobr></td>
-	<td><nobr><%kummpk30%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>&Uuml;brige Steuern</nobr></td>
-	<td><nobr><%jetzt19%></nobr></td>
-	<td><nobr><%jetztgl19%></nobr></td>
-	<td><nobr><%jetztgk19%></nobr></td>
-	<td><nobr><%jetztpk19%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm19%></nobr></td>
-	<td><nobr><%kummg191%></nobr></td>
-	<td><nobr><%kummgk19%></nobr></td>
-	<td><nobr><%kummpk19%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Sonst. neutr. Aufwand</nobr></td>
-	<td><nobr><%jetzt31%></nobr></td>
-	<td><nobr><%jetztgl31%></nobr></td>
-	<td><nobr><%jetztgk31%></nobr></td>
-	<td><nobr><%jetztpk31%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm31%></nobr></td>
-	<td><nobr><%kummgl31%></nobr></td>
-	<td><nobr><%kummgk31%></nobr></td>
-	<td><nobr><%kummpk31%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white subtotal">
-<td class="left"><nobr>Neutraler Aufwand</nobr></td>
-	<td><nobr><%jetztneutraleraufwand%></nobr></td>
-	<td><nobr><%jetztglneutraleraufwand%></nobr></td>
-	<td><nobr><%jetztgkneutraleraufwand%></nobr></td>
-	<td><nobr><%jetztpkneutraleraufwand%></nobr></td>
-	<td></td>
-	<td><nobr><%kummneutraleraufwand%></nobr></td>
-	<td><nobr><%kummglneutraleraufwand%></nobr></td>
-	<td><nobr><%kummgkneutraleraufwand%></nobr></td>
-	<td><nobr><%kummpkneutraleraufwand%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="white">
-	<td class="left"><nobr>Zinsertr&auml;ge</nobr></td>
-	<td><nobr><%jetzt32%></nobr></td>
-	<td><nobr><%jetztgl32%></nobr></td>
-	<td><nobr><%jetztgk32%></nobr></td>
-	<td><nobr><%jetztpk32%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm32%></nobr></td>
-	<td><nobr><%kummgl32%></nobr></td>
-	<td><nobr><%kummgk32%></nobr></td>
-	<td><nobr><%kummpk32%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Sonst. neutr. Ertr.</nobr></td>
-	<td><nobr><%jetzt33%></nobr></td>
-	<td><nobr><%jetztgl33%></nobr></td>
-	<td><nobr><%jetztgk33%></nobr></td>
-	<td><nobr><%jetztpk33%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm33%></nobr></td>
-	<td><nobr><%kummgl33%></nobr></td>
-	<td><nobr><%kummgk33%></nobr></td>
-	<td><nobr><%kummpk33%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="white">
-	<td class="left"><nobr>Verr.kalk.Kosten</nobr></td>
-	<td><nobr><%jetzt34%></nobr></td>
-	<td><nobr><%jetztgl34%></nobr>
-	<td><nobr><%jetztgk34%></nobr></td>
-	<td><nobr><%jetztpk34%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm34%></nobr></td>
-	<td><nobr><%kummgl34%></nobr></td>
-	<td><nobr><%kummgk34%></nobr></td>
-	<td><nobr><%kummpk34%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-
-<tr class="grey subtotal">
-	<td class="left"><nobr>Neutraler Ertrag</nobr></td>
-	<td><nobr><%jetztneutralerertrag%></nobr></td>
-	<td><nobr><%jetztglneutralerertrag%></nobr></td>
-	<td><nobr><%jetztgkneutralerertrag%></nobr></td>
-	<td><nobr><%jetztpkneutralerertrag%></nobr></td>
-	<td></td>
-	<td><nobr><%kummneutralerertrag%></nobr></td>
-	<td><nobr><%kummglneutralerertrag%></nobr></td>
-	<td><nobr><%kummgkneutralerertrag%></nobr></td>
-	<td><nobr><%kummpkneutralerertrag%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-	
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="grey subtotal">
-	<td class="left"><nobr>Ergebnis vor Steuern</nobr></td>
-	<td><nobr><%jetztergebnisvorsteuern%></nobr></td>
-	<td><nobr><%jetztglergebnisvorsteuern%></nobr></td>
-	<td><nobr><%jetztgkergebnisvorsteuern%></nobr></td>
-	<td><nobr><%jetztpkergebnisvorsteuern%></nobr></td>
-	<td></td>
-	<td><nobr><%kummergebnisvorsteuern%></nobr></td>
-	<td><nobr><%kummglergebnisvorsteuern%></nobr></td>
-	<td><nobr><%kummgkergebnisvorsteuern%></nobr></td>
-	<td><nobr><%kummpkergebnisvorsteuern%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-	
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="grey">
-	<td class="left"><nobr>Steuern Eink.u.Ertr.</nobr></td>
-	<td><nobr><%jetzt35%></nobr></td>
-	<td><nobr><%jetztgl35%></nobr></td>
-	<td><nobr><%jetztgk35%></nobr></td>
-	<td><nobr><%jetztpk35%></nobr></td>
-	<td></td>
-	<td><nobr><%kumm35%></nobr></td>
-	<td><nobr><%kummgl35%></nobr></td>
-	<td><nobr><%kummgk35%></nobr></td>
-	<td><nobr><%kummpk35%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-	
-<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
-
-<tr class="grey subtotal">
-	<td class="left"><nobr>Vorl&auml;ufiges Ergebnis</nobr></td>
-	<td><nobr><%jetztergebnis%></nobr></td>
-	<td><nobr><%jetztglergebnis%></nobr></td>
-	<td><nobr><%jetztgkergebnis%></nobr></td>
-	<td><nobr><%jetztpkergebnis%></nobr></td>
-	<td></td>
-	<td><nobr><%kummergebnis%></nobr></td>
-	<td><nobr><%kummglergebnis%></nobr></td>
-	<td><nobr><%kummgkergebnis%></nobr></td>
-	<td><nobr><%kummpkergebnis%></nobr></td>
-	<td class="right">&nbsp;</td>
-</tr>
-	
-<tr class="white" id=last><td class="left right"
-colspan="11">&nbsp;</td></tr>
-
-<tr>
-	<td colspan=11 class=footer>W&auml;hrung: Euro - FiBu: LX Office ERP
-(Version <%version%>) - Formular: 11.01.2007</td>
-</tr>
-
-</table>
-</body>
diff --git a/templates/German-check.tex b/templates/German-check.tex
deleted file mode 100644
index 6086d457d..000000000
--- a/templates/German-check.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Rechnung} & \textbf{Ausgestellt}
-  & \textbf{Fällig} & \textbf{Verrechnet} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/German-credit_note.tex b/templates/German-credit_note.tex
deleted file mode 100644
index 61cd7f369..000000000
--- a/templates/German-credit_note.tex
+++ /dev/null
@@ -1,90 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{eurosym}
-\usepackage{tabularx}
-\usepackage{ifthen}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\setlength{\parindent}{0cm}
-
-\pagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Gutschrift}}} \vspace*{0.2cm}
-  \rightline{\large\textbf{\textit{Nr. <%invnumber%>% \vspace*{0.2cm}
-  }}}
-  für Rechnung: \hfill <%invnumber_for_credit_note%>
-
-  Gutschriftdatum:\hfill <%invdate%>
-
-  Auftrag-Nr:\hfill <%ordnumber%>
-
-  Telefon:\hfill <%phone%>
-
-  Telefax:\hfill <%fax%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-Ihre Bestellung <%cusordnumber%> vom <%orddate%>
-% \hfill
-
-\vspace*{0.5cm}
-
-Sehr geehrte Damen und Herren,
-
-\vspace{0.5cm}
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> \euro & <%linetotal%> \euro \\
-    <%if discount_sub%> & Zwischensumme: &  & <%discount_sub%> \euro  & <%end if%>\\
-  <%end number%>\hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\ 
-  <%foreach tax%>
-  \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
-  <%end tax%>
-  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%invtotal%> \euro} \\ \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-\end{document}
-
diff --git a/templates/German-income_statement.html b/templates/German-income_statement.html
deleted file mode 100644
index 36b612b58..000000000
--- a/templates/German-income_statement.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<body>
-
-<h2 align=center>
-Einnahmen&uuml;berschu&szlig;rechnung</h2>
-<h3 align=center>-E&Uuml;R- (Gewinnermittlung nach &sect;4 Abs. 3 EStG)
-<br><%period%>
-</h3>
-
-<table width=100% border=0>
-<tr>
-  <td width=75% align=left colspan=2><font size="+1"><b>A. Betriebseinnahmen</font></b><br></td>
-  <td></td>
-</tr>
-
-<tr>
-  <td>
-	Umsatzerl&ouml;se  
-  </td>
-  <td>
-	<%eur1%>
-  </td>
-</tr>
-<tr>
-  <td>
-	sonstige Erl&ouml;se  
-  </td>
-  <td>
-	<%eur2%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Privatanteile
-  </td>
-  <td>
-	<%eur3%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Zinsertr&auml;ge
-  </td>
-  <td>
-	<%eur4%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Au&szlig;erordentliche Ertr&auml;ge
-  </td>
-  <td>
-	<%eur5%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Vereinnahmte Umsatzsteuer
-  </td>
-  <td>
-	<%eur6%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Umsatzsteuererstattungen
-  </td>
-  <td>
-	<%eur7%>  
-  </td>
-</tr>
-
-
-<tr>
-  <td> </td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <th align=left><b>Summe Einnahmen</b></th>
-  <td align=right><%sumeura%><hr noshade size=2></td>
-</tr>
-<tr>
-  <td></td>
-  <td><br><br></td>
-</tr>
-<tr>
-  <td align=left><font size="+1"><b>B. Betriebsausgaben</font></b><br></td>
-  <td></td>
-</tr>
-
-<tr>
-  <td>
-	Wareneing&auml;nge
-  </td>
-  <td>
-	<%eur8%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	L&ouml;hne und Geh&auml;ter
-  </td>
-  <td>
-	<%eur9%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Gesetzlicher sozialer Aufwand
-  </td>
-  <td>
-	<%eur10%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Mieten
-  </td>
-  <td>
-	<%eur11%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Gas, Strom, Wasser
-  </td>
-  <td>
-	<%eur12%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Instandhaltung
-  </td>
-  <td>
-	<%eur13%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Steuern, Versicherungen, Beitr&auml;ge
-  </td>
-  <td>
-	<%eur14%>  
-  </td>
-</tr>
-<tr>
-  <td>
-	Kfz-Steuern
-  </td>
-  <td>
-	<%eur15%>  
-  </td>
-</tr><tr>
-  <td>
-	Kfz-Versicherungen
-  </td>
-  <td>
-	<%eur16%>  
-  </td>
-</tr><tr>
-  <td>
-	Sonstige Fahrzeugkosten
-  </td>
-  <td>
-	<%eur17%>  
-  </td>
-</tr><tr>
-  <td>
-	Werbe- und Reisekosten
-  </td>
-  <td>
-	<%eur18%>  
-  </td>
-</tr><tr>
-  <td>
-	Instandhaltung und Werkzeuge
-  </td>
-  <td>
-	<%eur19%>  
-  </td>
-</tr><tr>
-  <td>
-	Fachzeitschriften, B&uuml;cher
-  </td>
-  <td>
-	<%eur20%>  
-  </td>
-</tr><tr>
-  <td>
-	Miete f&uuml;r Einrichtungen
-  </td>
-  <td>
-	<%eur21%>  
-  </td>
-</tr><tr>
-  <td>
-	Rechts- und Beratungskosten
-  </td>
-  <td>
-	<%eur22%>  
-  </td>
-</tr><tr>
-  <td>
-	B&uuml;robedarf, Porto, Telefon
-  </td>
-  <td>
-	<%eur23%>  
-  </td>
-</tr><tr>
-  <td>
-	Sonstige Aufwendungen
-  </td>
-  <td>
-	<%eur24%>  
-  </td>
-</tr><tr>
-  <td>
-	Abschreibungen auf Anlageverm&ouml;gen
-  </td>
-  <td>
-	<%eur25%>  
-  </td>
-</tr><tr>
-  <td>
-	Abschreibungen auf GWG
-  </td>
-  <td>
-	<%eur26%>  
-  </td>
-</tr><tr>
-  <td>
-	Vorsteuer
-  </td>
-  <td>
-	<%eur27%>  
-  </td>
-</tr><tr>
-  <td>
-	Umsatzsteuerzahlungen
-  </td>
-  <td>
-	<%eur28%>  
-  </td>
-</tr><tr>
-  <td>
-	Zinsaufwand
-  </td>
-  <td>
-	<%eur29%>  
-  </td>
-</tr><tr>
-  <td>
-	Au&szlig;erordentlicher Aufwand
-  </td>
-  <td>
-	<%eur30%>  
-  </td>
-</tr><tr>
-  <td>
-	Betriebliche Steuern
-  </td>
-  <td>
-	<%eur31%>  
-  </td>
-</tr>
-
-
-<tr>
-  <td> </td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <th align=left><b>Summe Ausgaben</b></th>
-  <td align=right><%sumeurb%> <br><hr noshade size=2</td>
-</tr>
-<tr>
-  <td></td>
-  <td><br><br></td>
-</tr>
-<tr valign=top>
-  <td align=left>GEWINN / VERLUST</td>
-  <td align=right><%guvsumme%><br><hr noshade size=2></td>
-</tr>
-
-</table>
-
-</body>
-</html>
-
diff --git a/templates/German-invoice.html b/templates/German-invoice.html
deleted file mode 100644
index 2858f4f08..000000000
--- a/templates/German-invoice.html
+++ /dev/null
@@ -1,268 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telefon <%tel%>
-      <br>Telefax <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>R E C H N U N G</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Ausgestellt am</th><td width=10>&nbsp;</td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Bezahlbar bis</th><td width=10>&nbsp;</td><td><%duedate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Nummer</th><td>&nbsp;</td><td><%invnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <th align=right>Lieferdatum</th><td>&nbsp;</td><td><%deliverydate%></td></tr>
-    </tr>
-<!--
-    <tr>
-      <th align=right>Clerk:</th><td>&nbsp;</td><td><%username%></td>
-    </tr>
--->
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>An:</th>
-      <th align=left><font color=ffffff>Lieferaddresse:</th>
-    </tr>
-
-<!--
-     other variables which can be use:
-     contact, shiptocontact, shiptophone, shiptofax
--->
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-      
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Nummer</th>
-      <th align=left><font color=ffffff>Beschreibung</th>
-      <th><font color=ffffff>Anz.</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Preis</th>
-      <th><font color=ffffff>Rab</th>
-      <th><font color=ffffff>Total</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-<!--
-you can also use netprice instead of sellprice if you
-don't want to show the discount
-netprice = sellprice - discount
--->
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-<%if taxincluded%>
-    <tr>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><%invtotal%></td>
-    </tr>
-<%end taxincluded%>
-<%if not taxincluded%>
-    <tr>
-      <th colspan=5 align=right>Zwischensumme</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-<%end taxincluded%>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=5 align=right><%taxdescription%> auf <%taxbase%></th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-<%if paid%>
-    <tr>
-      <th colspan=5 align=right>Bezahlt</th>
-      <td colspan=2 align=right>- <%paid%></td>
-    </tr>
-<%end paid%>
-
-    <tr>
-      <td colspan=3>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>Bezahlbar innerhalb von <b><%terms%></b> Tagen</td>
-<%if total%>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%total%></th>
-<%end total%>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Bemerkungen:</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      Alle Preise in <b><%currency%></b>
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Rechnung ist bezahlbar innerhalb von <%terms%> Tagen.
-    Nach dem <%duedate%> werden Zinsen zu einem
-    monatlichen Satz von 1.5% verrechnet.
-    Waren bleiben im Besitz von <%company%> bis die Rechnung voll bezahlt ist.
-    Rückgaben werden mit 10% Lagergebühren belastet. Beschädigte Waren
-    und Waren ohne eine Rückgabenummer werden nicht entgegengenommen.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-<%foreach tax%>
-  <tr>
-    <th colspan=7 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
-  </tr>
-<%end tax%>
-
-<%if taxincluded%>
-  <tr>
-    <th colspan=7 align=left><font size=-2>Steuern sind im Preis inbegriffen.</th>
-  </tr>
-<%end taxincluded%>
-
-<!-- business number
-  <tr>
-    <th colspan=7 align=left><font size=-2>Business Number: <%businessnumber%></font></th>
-  </tr>
--->
-
-  <tr>
-    <th colspan=7 align=left>
-    <hr>
-    <br>Bankverbindung
-    <br>Bank
-    <br>Bankleitzahl
-    <br>Konto No.
-    </td>
-  </tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/German-invoice.odt b/templates/German-invoice.odt
deleted file mode 100644
index 822ba9062..000000000
Binary files a/templates/German-invoice.odt and /dev/null differ
diff --git a/templates/German-invoice.tex b/templates/German-invoice.tex
deleted file mode 100644
index 96fe5023b..000000000
--- a/templates/German-invoice.tex
+++ /dev/null
@@ -1,95 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{eurosym}
-\usepackage{tabularx}
-\usepackage{ifthen}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\setlength{\parindent}{0cm}
-
-\pagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Rechnung}}} \vspace*{0.2cm}
-  \rightline{\large\textbf{\textit{Nr. <%invnumber%>% \vspace*{0.2cm}
-  }}}
-
-  Rechnungsdatum:\hfill <%invdate%>
-
-  Auftrag-Nr:\hfill <%ordnumber%>
-
-  Telefon:\hfill <%phone%>
-
-  Telefax:\hfill <%fax%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-Ihre Bestellung <%cusordnumber%> vom <%orddate%>
-% \hfill
-
-
-\vspace*{0.5cm}
-
-Sehr geehrte Damen und Herren,
-
-für unsere erbrachten Lieferungen und Leistungen erlauben wir uns,
-folgende Positionen in Rechnung zu stellen.
-
-\vspace{0.5cm}
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> \euro & <%linetotal%> \euro \\
-    <%if discount_sub%> & Zwischensumme: &  & <%discount_sub%> \euro  & <%end if%>\\
-  <%end number%>\hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\ 
-  <%foreach tax%>
-  \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
-  <%end tax%>
-  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%invtotal%> \euro} \\ \hline
-\end{tabularx}
-
-\vspace{1cm}
-\ifthenelse{\equal{<%deliverydate%>}{}}{Das Leistungsdatum entspricht, soweit nicht anders angegeben, dem Rechnungsdatum.}{Liefertermin: <%deliverydate%>} \\
-Zahlbar bis <%duedate%> in Summe <%invtotal%> \euro\ ohne Abzüge.
-
-\end{document}
-
diff --git a/templates/German-pick_list.html b/templates/German-pick_list.html
deleted file mode 100644
index 0de88eb5b..000000000
--- a/templates/German-pick_list.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	  <h4>
-	  <%company%>
-	  <br><%address%>
-	  </h4>
-	  </td>
-
-	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
-	  <td align=right>
-	  <h4>
-	  Tel: <%tel%>
-	  <br>Fax: <%fax%>
-	  </h4>
-	  </td>
-	</tr>
-
-	<tr>
-	  <th colspan=3>
-	    <h4>S A M M E L L I S T E</h4>
-	  </th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% callspacing=0 cellpadding=0>
-        <tr bgcolor=000000>
-	  <th width=50% align=left><font color=ffffff>Lieferanschrift:</th>
-	  <th width=50%>&nbsp;</th>
-	</tr>
-
-	<tr valign=top>
-	  <td><%shiptoname%>
-	  <br><%shiptostreet%>
-	  <br><%shiptozipcode%>
-	  <br><%shiptocity%>
-	  <br><%shiptocountry%>
-	  </td>
-
-	  <td>
-	  <%if shiptocontact%>
-	  <br>Kontakt: <%shiptocontact%>
-	  <%end shiptocontact%>
-
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
-
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
-
-	  <%shiptoemail%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr height=5></tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100% border=1>
-        <tr>
-	  <th width=17% align=left>BestellNr. #</th>
-	  <th width=17% align=left>Datum</th>
-	  <th width=17% align=left nowrap>Kontakt</th>
-	  <%if warehouse%>
-	  <th width=17% align=left>Lager</th>
-	  <%end warehouse%>
-	  <th width=17% align=left>Versandort</th>
-	  <th width=15% align=left>Transportmittel</th>
-	</tr>
-
-        <tr>
-	  <td><%ordnumber%>&nbsp;</td>
-
-	  <%if shippingdate%>
-	  <td><%shippingdate%></td>
-	  <%end shippingdate%>
-
-	  <%if not shippingdate%>
-	  <td><%orddate%></td>
-	  <%end shippingdate%>
-
-	  <td><%employee%>&nbsp;</td>
-
-	  <%if warehouse%>
-	  <td><%warehouse%>&nbsp;</td>
-	  <%end warehouse%>
-
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td>
-      <table width=100%>
-	<tr bgcolor=000000>
-	  <th align=left><font color=ffffff>Pos</th>
-	  <th align=left><font color=ffffff>Nummer</th>
-	  <th align=left><font color=ffffff>Beschreibung</th>
-	  <th><font color=ffffff>Menge</th>
-	  <th><font color=ffffff>geliefert</th>
-	  <th>&nbsp;</th>
-	  <th><font color=ffffff>Lagerplatz</th>
-	</tr>
-
-        <%foreach number%>
-	<tr valign=top>
-	  <td><%runningnumber%>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td align=right>[&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]</td>
-	  <td><%unit%></td>
-	  <td align=right><%bin%></td>
-	</tr>
-	<%end number%>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-
-    <td><hr noshade></td>
-  </tr>
-
-</table>
-
diff --git a/templates/German-pick_list.tex b/templates/German-pick_list.tex
deleted file mode 100644
index d560e0684..000000000
--- a/templates/German-pick_list.tex
+++ /dev/null
@@ -1,139 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{
-    <%company%>
-    
-    <%address%>
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Tel & <%tel%>\\
-  Fax & <%fax%>
-  \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
- 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
-  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-  \textbf{Lieferanschrift}
-} \hfill
-
-\vspace{0.7cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
-}
-\parbox[t]{.4\textwidth}{
-  <%shiptocontact%>
-
-  <%if shiptophone%>
-  Tel: <%shiptophone%>
-  <%end shiptophone%>
-
-  <%if shiptofax%>
-  Fax: <%shiptofax%>
-  <%end shiptofax%>
-
-  <%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{S A M M E L L I S T E}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
-  <%if warehouse%>
-  & \textbf{Lager}
-  <%end warehouse%>
-  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
-  \hline
-  <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%orddate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
-  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> &
-  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-}
-
-\end{document}
-
diff --git a/templates/German-purchase_order.html b/templates/German-purchase_order.html
deleted file mode 100644
index e83c67a2b..000000000
--- a/templates/German-purchase_order.html
+++ /dev/null
@@ -1,188 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telefon <%tel%>
-      <br>Telefax <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>B E S T E L L U N G</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Bestellungsdatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Lieferbar bis</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>An:</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Nummer</th>
-      <th align=left><font color=ffffff>Artikel</th>
-      <th><font color=ffffff>Anz</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Preis</th>
-      <th><font color=ffffff>Total</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=6><hr noshade></td>
-    </tr>
-    
-    <tr>
-      <th colspan=4 align=right>Zwischensumme</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=2>Netto <b><%terms%></b> Tage</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%total%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Bemerkungen</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      Alle Preise in <b><%currency%></b>
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    &nbsp;
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/German-purchase_order.tex b/templates/German-purchase_order.tex
deleted file mode 100644
index 715bd1b98..000000000
--- a/templates/German-purchase_order.tex
+++ /dev/null
@@ -1,85 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{eurosym}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\thispagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\setlength{\parindent}{0cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> & <%linetotal%>\\
-  <%end number%>
-
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Bestellung}}}
-  \rightline{\large\textbf{\textit{Nr. <%ordnumber%>%
-  }}}
-
-  Datum:\hfill <%orddate%>
-
-  Kunden-Nr:\hfill <%customernumber%>
-
-  Telefon:\hfill <%phone%>
-
-  Telefax:\hfill <%fax%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-
-Hiermit bestellen wir verbindlich folgende Positionen:
-\vspace{0.5cm}
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> \euro  & <%linetotal%> \euro \\
-  <%end number%> \hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro\\
-  <%foreach tax%>
-    \multicolumn{4}{l}{<%taxdescription%>} & <%tax%>\euro \\
-  <%end tax%>
-  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%ordtotal%> \euro} \\
-\end{tabularx}
-\hrule
-
-\end{document}
-
diff --git a/templates/German-receipt.tex b/templates/German-receipt.tex
deleted file mode 100644
index 6086d457d..000000000
--- a/templates/German-receipt.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Rechnung} & \textbf{Ausgestellt}
-  & \textbf{Fällig} & \textbf{Verrechnet} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/German-request_quotation.html b/templates/German-request_quotation.html
deleted file mode 100644
index 6ff003634..000000000
--- a/templates/German-request_quotation.html
+++ /dev/null
@@ -1,194 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58>
-    </td>
-
-    <td align=right>
-      <h4>
-      Tel: <%tel%>
-      <br>Fax: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>A N F R A G E</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left width=50%><font color=ffffff>Rechnungsanschrift:</th>
-      <th align=left width=50%><font color=ffffff>Lieferanschrift:</th>
-    </tr>
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-<br>
-<%if contact%>
-<br>Kontakt: <%contact%>
-<%end contact%>
-<%if vendorphone%>
-<br>Tel: <%vendorphone%>
-<%end vendorphone%>
-<%if vendorfax%>
-<br>Fax: <%vendorfax%>
-<%end vendorfax%>
-      </td>
-
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-<br>
-<%if shiptocontact%>
-<br>Kontakt: <%shiptocontact%>
-<%end shiptocontact%>
-<%if shiptophone%>
-<br>Tel: <%shiptophone%>
-<%end shiptophone%>
-<%if shiptofax%>
-<br>Fax: <%shiptofax%>
-<%end shiptofax%>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr><td>&nbsp;</td></tr>
-
-  <tr>
-    <td colspan=2>
-    <table width=100% border=1>
-    <tr>
-      <th width=17% align=left>AnfrageNr. #</th>
-      <th width=17% align=left>Datum</th>
-      <th width=17% align=left>Erforderlich am</th>
-      <th width=17% align=left>Kontakt</th>
-      <th width=17% align=left>Lagerplatz</th>
-      <th width=15% align=left>Versand mit:</th>
-    </tr>
-
-    <tr>
-      <td><%quonumber%></td>
-      <td><%quodate%></td>
-      <td><%reqdate%></td>
-      <td><%employee%></td>
-      <td><%shippingpoint%></td>
-      <td><%shipvia%></td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr height="10"></tr>
-
-  <tr>
-    <td>Bitte teilen Sie uns Preise und Lieferzeit für folgende Artikel mit:</td>
-  </tr>
-
-  <tr height="10"></tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr>
-<!--      <th align=right>No.</th>  -->
-      <th align=left>ArtNr.</th>
-      <th align=left>Beschreibung</th>
-      <th>Menge</th>
-      <th>&nbsp;</th>
-      <th>Lieferung</th>
-      <th>Stückpreis</th>
-      <th>Gesamtpreis</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-other per line item variables available <%reqdate%>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-<%if notes%>
-    <tr valign=top>
-      <td>Bemerkungen</td>
-      <td><%notes%></td>
-    </tr>
-<%end notes%>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td width=70%>&nbsp;</td>
-
-    <td width=30%>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/German-request_quotation.tex b/templates/German-request_quotation.tex
deleted file mode 100644
index f17eb629f..000000000
--- a/templates/German-request_quotation.tex
+++ /dev/null
@@ -1,173 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage{graphicx}
-\usepackage{german}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{12cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
-  \parbox[b]{.42\textwidth}{
-    <%company%>
-
-    <%address%>
-  }\hfill
-  \begin{tabular}[b]{rr@{}}
-  Tel & <%tel%>\\
-  Fax & <%fax%>
-  \end{tabular}
-
-  \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Zwischenzumme} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
-  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\
-<%end pagebreak%>
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.45\textwidth}{
-\textbf{To}
-\vspace{0.7cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-<%contact%>
-<%end contact%>
-
-\vspace{0.2cm}
-
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
-
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
-
-<%email%>
-}
-\parbox[t]{.45\textwidth}{
-\textbf{Lieferanschrift}
-\vspace{0.7cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-<%shiptocontact%>
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{A N F R A G E}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
-  \textbf{AnfrageNr. \#} & \textbf{Datum} & \textbf{Benötigt am} & \textbf{Kontakt} & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5ex]
-  \hline
-  <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
-  \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-Bitte nennen Sie uns für folgende Artikel Preis und Liefertermin:
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
-  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> & <%unit%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\hfill
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\end{document}
-
diff --git a/templates/German-sales_delivery_order.tex b/templates/German-sales_delivery_order.tex
deleted file mode 100644
index d2ecab214..000000000
--- a/templates/German-sales_delivery_order.tex
+++ /dev/null
@@ -1,78 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{eurosym}
-\usepackage{tabularx}
-\usepackage{ifthen}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\setlength{\parindent}{0cm}
-
-\pagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Lieferschein}}} \vspace*{0.2cm}
-  \rightline{\large\textbf{\textit{Nr. <%donumber%>% \vspace*{0.2cm}
-  }}}
-
-  Lieferscheindatum:\hfill <%dodate%>
-
-  Kunden-Nr:\hfill <%customernumber%>
-
-  Telefon:\hfill <%phone%>
-
-  Telefax:\hfill <%fax%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl@{}}
-  \textbf{Nummer} & \textbf{Artikel} & \textbf{Anz} & \textbf{Einh}  \\
-
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> & <%unit%>   \\
-    & <%serialnumber%>  & & \\
-<%end number%>
-\end{tabular*}
-
-\vspace{1cm}
-<%if deliverydate%>
-        Die Auslieferung/Fertigstellung erfolgte am : <%deliverydate%>
-<%end if%>
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-\end{document}
-
diff --git a/templates/German-sales_order.html b/templates/German-sales_order.html
deleted file mode 100644
index 4cbe20afb..000000000
--- a/templates/German-sales_order.html
+++ /dev/null
@@ -1,213 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telefon <%tel%>
-      <br>Telefax <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>B E S T E L L U N G</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Bestelldatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Lieferbar bei</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Verrechnet An:</th>
-      <th align=left><font color=ffffff>Lieferaddresse:</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Nummer</th>
-      <th align=left><font color=ffffff>Artikel</th>
-      <th><font color=ffffff>Anz</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Preis</th>
-      <th><font color=ffffff>Rab</th>
-      <th><font color=ffffff>Total</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=7><hr noshade></td>
-    </tr>
-    
-<%if taxincluded%>
-    <tr>
-      <th colspan=5 align=right>Total</th>
-      <td colspan=2 align=right><%ordtotal%></td>
-    </tr>
-<%end taxincluded%>
-
-<%if not taxincluded%>
-    <tr>
-      <th colspan=5 align=right>Zwischensumme</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-<%end taxincluded%>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=5 align=right><%taxdescription%> auf <%taxbase%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=5><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>Netto <b><%terms%></b> Tage</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%ordtotal%></th>
-    </tr>
-<%if taxincluded%>
-    <tr>
-      <td colspan=3>Steuern sind im Preis inbegriffen</td>
-    </tr>
-<%end taxincluded%>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Bemerkungen</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      Alle Preise in <b><%currency%></b>
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Spezialprodukte werden nicht zurückgenommen. Für alle anderen Waren
-    wird eine 10% Stornogebühr verrechnet.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/German-sales_order.tex b/templates/German-sales_order.tex
deleted file mode 100644
index f4b43a779..000000000
--- a/templates/German-sales_order.tex
+++ /dev/null
@@ -1,90 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{eurosym}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\thispagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\setlength{\parindent}{0cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> & <%linetotal%>\\
-  <%end number%>
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Auftragsbestätigung}}} \vspace*{0.2cm}
-  \rightline{\large\textbf{\textit{Nr. <%ordnumber%>%
-  }}} \vspace*{0.2cm}
-
-  Datum:\hfill <%orddate%>
-
-  Kunden-Nr:\hfill <%customernumber%>
-
-  Telefon:\hfill <%phone%>
-
-  Telefax:\hfill <%fax%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-\hfill
-
-\vspace{0.5cm}
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> \euro  & <%linetotal%> \euro \\
-  <%end number%> \hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro\\
-  <%foreach tax%>
-    \multicolumn{4}{l}{<%taxdescription%>} & <%tax%>\euro \\
-  <%end tax%>
-  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%ordtotal%> \euro} \\
-\end{tabularx}
-\hrule
-
-\vspace{1cm}
-Vereinbarter Liefertermin: <%reqdate%> \\ \\
-\textit{Bitte kontrollieren Sie alle Positionen auf Übereinstimmung
-  mit Ihrer Bestellung! Abweichungen teilen Sie innerhalb von 3 Tagen
-  mit!} \\ \\
-
-\end{document}
-
diff --git a/templates/German-sales_quotation.html b/templates/German-sales_quotation.html
deleted file mode 100644
index 138063154..000000000
--- a/templates/German-sales_quotation.html
+++ /dev/null
@@ -1,221 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr valign=top>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
-    <td align=right>
-      <h4>
-      Tel: <%tel%>
-      <br>Fax: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-<tr><td colspan=3>&nbsp;</td></tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>A N G E B O T</h4>
-    </th>
-  </tr>
-
-  </table>
-
-  <table width=100% callspacing=0 cellpadding=0>
-
-  <tr>
-    <td>
-    <table width=100%>
-
-    <tr valign=top>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-<br>
-<%if contact%>
-<br>Kontakt: <%contact%>
-<%end contact%>
-
-<%if customerphone%>
-<br>Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-<br>Fax: <%customerfax%>
-<%end customerfax%>
-
-<%if email%>
-<br><%email%>
-<%end email%>
-      </td>
-
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr><td>&nbsp;</td></tr>
-
-  <tr>
-    <td colspan=2>
-      <table width=100% border=1>
-        <tr>
-	  <th width=17% align=left nowrap>Nummer</th>
-	  <th width=17% align=left>Datum</th>
-	  <th width=17% align=left>Gültig bis</th>
-	  <th width=17% align=left nowrap>Kontakt</th>
-	  <th width=17% align=left nowrap>Lagerplatz</th>
-	  <th width=15% align=left nowrap>Lieferung mit</th>
-	</tr>
-
-	<tr>
-	  <td><%quonumber%></td>
-	  <td><%quodate%></td>
-	  <td><%reqdate%></td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%></td>
-	  <td><%shipvia%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=right><font color=ffffff>Nr.</th>
-      <th align=left><font color=ffffff>Artikelnummer</th>
-      <th align=left><font color=ffffff>Beschreibung</th>
-      <th><font color=ffffff>Menge</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Preis</th>
-      <th><font color=ffffff>Rabatt</th>
-      <th><font color=ffffff>Gesamtpreis</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-    <td align=right><%runningnumber%></td>
-
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%discount%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=8><hr noshade></td>
-    </tr>
-
-    <tr>
-<%if taxincluded%>
-      <th colspan=6 align=right>Gesamtbetrag netto</th>
-      <td colspan=2 align=right><%invtotal%></td>
-<%end taxincluded%>
-
-<%if not taxincluded%>
-      <th colspan=6 align=right>Zwischensumme</th>
-      <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=6 align=right><%taxdescription%> von <%taxbase%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=4>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=4>&nbsp;
-<%if terms%>
-      Zahlungsziel <b><%terms%></b> Tage
-<%end terms%>
-      </td>
-      <th colspan=2 align=right>Gesamtbetrag brutto</th>
-      <th colspan=2 align=right><%quototal%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Bemerkungen</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      Alle Preise in <b><%currency%></b> Euro
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td width=60%><font size=-3>
-    Spezialanfertigungen können nicht zurückgenommen werden.
-    </font>
-    </td>
-    <td width=40%>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
-
diff --git a/templates/German-sales_quotation.odt b/templates/German-sales_quotation.odt
deleted file mode 100644
index d42a867ec..000000000
Binary files a/templates/German-sales_quotation.odt and /dev/null differ
diff --git a/templates/German-sales_quotation.tex b/templates/German-sales_quotation.tex
deleted file mode 100644
index 8fdbace74..000000000
--- a/templates/German-sales_quotation.tex
+++ /dev/null
@@ -1,95 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{eurosym}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\thispagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\setlength{\parindent}{0cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> & <%linetotal%>\\
-  <%end number%>
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Angebot}}}
-  \rightline{\large\textbf{\textit{Nr. <%quonumber%>%
-  }}}
-
-  Datum:\hfill <%transdate%>
-
-  Kunden-Nr:\hfill <%customernumber%>
-
-  Telefon:\hfill <%phone%>
-
-  Telefax:\hfill <%fax%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-\hfill
-
-\vspace{0.5cm}
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> \euro & <%linetotal%> \euro \\
-  <%end number%> \hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\
-  <%foreach tax%>
-  \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
-  <%end tax%>
-  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%ordtotal%> \euro }
-\end{tabularx}
-\hrule
-
-\vspace{0.2cm}
-
-Wir danken für Ihre Anfrage und hoffen, Ihnen hiermit ein interessantes Angebot gemacht zu haben. Das Angebot ist
-  gültig bis zum <%reqdate%>. Sollten Sie noch Fragen oder Änderungswünsche haben, können Sie uns gerne jederzeit
-  unter den oben genannten Telefonnummern oder eMail-Adressen kontaktieren. \\
-  Bei der Durchführung des Auftrags gelten unsere AGB, die wir Ihnen gerne zuschicken. \\ \\
-  Mit freundlichen Grüßen, \\ \\ \\
-  <%employee_name%>
-
-
-
-\end{document}
-
diff --git a/templates/German-statement.html b/templates/German-statement.html
deleted file mode 100644
index 37e612c3d..000000000
--- a/templates/German-statement.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	    <h4>
-	    <%company%>
-	    <br><%address%>
-	    </h4>
-	  </td>
-	  <th></th>
-	  <td align=right>
-	  <h4>
-	  Tel: <%tel%>
-	  <br>Fax: <%fax%>
-	  </h4>
-	  </td>
-	</tr>
-	<tr>
-	  <th colspan=3><h4>S T A T E M E N T</h4></th>
-	</tr>
-	<tr>
-	  <td colspan=3 align=right><%statementdate%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr valign=top>
-	  <td><%name%>
-	  <br><%street%>
-	  <br><%zipcode%>
-	  <br><%city%>
-	  <br><%country%>
-	  <br>
-<%if customerphone%>
-	  <br>Tel: <%customerphone%>
-<%end customerphone%>
-<%if customerfax%>
-	  <br>Fax: <%customerfax%>
-<%end customerfax%>
-<%if email%>
-	  <br><%email%>
-<%end email%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-        <tr>
-	  <th align=left>Invoice #</th>
-	  <th width=15%>Date</th>
-	  <th width=15%>Due</th>
-	  <th width=10%>Current</th>
-	  <th width=10%>30</th>
-	  <th width=10%>60</th>
-	  <th width=10%>90+</th>
-	</tr>
-<%foreach invnumber%>
-	<tr>
-	  <td><%invnumber%></td>
-	  <td><%invdate%></td>
-	  <td><%duedate%></td>
-	  <td align=right><%c0%></td>
-	  <td align=right><%c30%></td>
-	  <td align=right><%c60%></td>
-	  <td align=right><%c90%></td>
-	</tr>
-<%end invnumber%>
-        <tr>
-	  <td colspan=7><hr size=1></td>
-	</tr>
-	<tr>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <th align=right><%c0total%></td>
-	  <th align=right><%c30total%></td>
-	  <th align=right><%c60total%></td>
-	  <th align=right><%c90total%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td align=right>
-      <table width=50%>
-        <tr>
-	  <th>Total Outstanding</th>
-          <th align=right><%total%></th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><hr noshade></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>Please make check payable to <b><%company%></b>.
-    </td>
-  </tr>
-  <tr height=20></tr>
-</table>
-
diff --git a/templates/German-statement.tex b/templates/German-statement.tex
deleted file mode 100644
index f2d0e496f..000000000
--- a/templates/German-statement.tex
+++ /dev/null
@@ -1,137 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{17cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-
-      <%address%>}\hfill
-    \begin{tabular}[b]{rrr@{}}
-    Tel & <%tel%>\\
-    Fax & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
-
-\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}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-  
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-}
-\parbox[t]{7.5cm}{
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{S T A T E M E N T} \hfill
-
-\hfill <%statementdate%>
-
-\vspace{2cm}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-<%foreach invnumber%>
-  <%invnumber%> & <%invdate%> & <%duedate%> &
-  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
-\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
-\end{tabular*}
-\rule{\textwidth}{1pt}
-
-\vspace{1cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Total outstanding} & <%total%>
-\end{tabularx}
-
-\vfill
-
-Please make check payable to <%company%>
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-}
-
-\end{document}
-
diff --git a/templates/German-taxbird.txb b/templates/German-taxbird.txb
deleted file mode 100644
index c1a8a39cc..000000000
--- a/templates/German-taxbird.txb
+++ /dev/null
@@ -1,23 +0,0 @@
-;; This file was produced by lx-office
-;; for using in taxbird. 
-;; You probably don't want to touch this 
-;; file. In case you do want it anyway, 
-;; be warned: BE CAREFUL!!
-;;
-'("Umsatzsteuervoranmeldung <%year%>" (
-("vend-id" . "74931")
-("land-lieferant" . "<%elsterland%>")
-("name-lieferant" . "<%company%>")
-("berufsbez" . "")
-("strasse-lieferant" . "<%co_street%>")
-("plz-lieferant" . "<%co_zip%> ")
-("ort-lieferant" . "<%co_city%>")
-("vorwahl" . "<%co_phone_prefix%>")
-("anschluss" . "<%co_phone%>")
-("land" . "<%taxbird_land_nr%>")
-("zeitraum" . "<%taxbird_period%>")
-("stnr" . "<%taxbird_steuernummer%>")
-
-<%foreach id%>
-("<%id%>" . "<%amount%>")<%end%>
-))
\ No newline at end of file
diff --git a/templates/German-ustva-2004.tex b/templates/German-ustva-2004.tex
deleted file mode 100644
index fb4b40c78..000000000
--- a/templates/German-ustva-2004.tex
+++ /dev/null
@@ -1,121 +0,0 @@
-% German USTVA template for taxreports
-%
-% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
-\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{0pt}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\hspace{7mm}\protect\includegraphics[viewport = 60 700 700 790]{ustva-2004-2.pdf}}
-{\protect\includegraphics[viewport = 60 700 700 790]{ustva-2004-1.pdf}}
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- &  \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%end fax%>
-}& & & &<%FA_10%> &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\end{tabular}\\[28.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\[22mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[14.5mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[46mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[7.9mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[14mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
-%\multicolumn{2}{||r|}{1000} & & & \\
-%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
-%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
-\end{tabular}
-
-\newpage
-
-\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[46mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[7.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[39.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[26.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
diff --git a/templates/German-ustva-2005.tex b/templates/German-ustva-2005.tex
deleted file mode 100644
index 30de7cfa9..000000000
--- a/templates/German-ustva-2005.tex
+++ /dev/null
@@ -1,118 +0,0 @@
-% German USTVA template for taxreports
-%
-% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
-\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{0pt}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\protect\scalebox{1.06}[1.07]{\protect\includegraphics[viewport = 64 700 700 743]{ustva-2005-2.pdf}}}
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790]{ustva-2005-1.pdf}}}
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- &  \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%end fax%>
-}& & & &<%FA_10%> &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\end{tabular}\\[28.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\[22.5mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[39mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[7.9mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
-\end{tabular}
-
-\newpage
-
-\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[46mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[7.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[40mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[26.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
diff --git a/templates/German-ustva-2006.tex b/templates/German-ustva-2006.tex
deleted file mode 100644
index 7a54edbb6..000000000
--- a/templates/German-ustva-2006.tex
+++ /dev/null
@@ -1,118 +0,0 @@
-% German USTVA template for taxreports
-%
-% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
-\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{0pt}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790]{ustva-2006-2.pdf}}}
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790]{ustva-2006-1.pdf}}}
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- &  \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[3mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%end fax%>
-}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\end{tabular}\\[29.5mm]
-\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
-&&&&\\[24.5mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[42mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
-\end{tabular}
-
-\newpage
-
-\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
-\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[42mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
diff --git a/templates/German-ustva-2007.tex b/templates/German-ustva-2007.tex
deleted file mode 100644
index 1965fa133..000000000
--- a/templates/German-ustva-2007.tex
+++ /dev/null
@@ -1,122 +0,0 @@
-% German USTVA template for taxreports
-%
-% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
-\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{0pt}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790]{ustva-2007-2.pdf}}}
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790]{ustva-2007-1.pdf}}}
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- &  \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[3mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
-
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{}}& & & & &\\[-1mm]
-\end{tabular}\\[29.5mm]
-\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
-&&&&\\[20.5mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
-\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[42mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
-\end{tabular}
-
-\newpage
-
-\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
-\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[42mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/German-ustva-2008.tex b/templates/German-ustva-2008.tex
deleted file mode 100644
index 2a50d361a..000000000
--- a/templates/German-ustva-2008.tex
+++ /dev/null
@@ -1,127 +0,0 @@
-% German USTVA template for taxreports
-% Contributed by Jacky und Stefan Tenne 
-% Based on template by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.7cm} %hier wird die Höhenverschiebung getÀtigt
-\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{1mm}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790,page=2]{ustva-2008.pdf}}}%Seite 2
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2008.pdf}}}%Seite 1
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- &  \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[3mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%end fax%>
-}& & & & &\\[1.8mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\end{tabular}\\[29.5mm]
-\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
-&&&&\\[15.6mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[8.5mm]
-\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[41.7mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
-\end{tabular}
-\newpage
-
-\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
-\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
-&&&&\\[0.75mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48.3mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.4mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[41.7mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28.4mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[25.6mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
-
-
-
-
-
-
-
-
-
-
diff --git a/templates/German-ustva.html b/templates/German-ustva.html
deleted file mode 100644
index 1f5da1ae7..000000000
--- a/templates/German-ustva.html
+++ /dev/null
@@ -1,436 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=utf-8" http-equiv="content-type">
-  <title>Vorschau: UStVa</title>
-<!--
-Optik an Formulare angepasst: Hartmut Goebel <h.goebel@goebel-consult.de>
-Variablen hinzugefügt: Udo Spallek <udono@gmx.net>
-Text-Erklärung und unterschiedliche Zeilenfärbung ergänzt: Kai-Martin Knaak <kmk@familieknaak.de>
--->
-  <style>
-table {
-	text-align: right;
-	border:0;
-	border-collapse:collapse;
-}
-td {
-	font-size:100%;
-	vertical-align:top;
-}
-td.text {
-	text-align: left;
-	background-color:#BDBEBD;
-}
-td.text2 {
-	text-align: left;
-	background-color:#ADBEBD;
-}
-td.spalte,
-td.zeile,
-td.betrag {
-	border:solid thin black;
-}
-td.spalte { font-weight:bold; font-size:120%; }
-td.zeile  { font-weight:bold; }
-td.betrag { width:10em; }
-td.summe  { border:solid medium black; }
-td.spacer { border:0 }
-
-tr.uebertrag td { border-top:solid medium black; }
-b.h3 { font-size:120%; }
-.ausfuellen { background-color:#FFFFC0; }
-.nodis { display:none; }
-  </style>
-</head>
-<body>
-<h1>Vorschau Umsatzsteuer-Voranmeldung</h1>
-<h2>Zeitraum vom <%fromdate%> bis <%todate%> </h2>
-
-<!-- Diese HTML-Formular ist nicht selbstrechnend.
-<p><small>Wenn ein (selbstrechnendes) Formular verwendet wird, genügt es, die
-gelb hinterlegten Felder auszufüllen. Die anderen Felder werden dann
-automatisch berechnet.</small></p>
--->
-
-<table width="100%">
-<tr align="left">
-  <td class="text">Steuernummer: <%steuernummer%></td>
-  <td class="text" width="100px">&nbsp</td>
-  <td class="text" align="right">Datum (<%Datum_heute%>)</td>
-</tr>
-<tr>
-  <td class="text" colspan="3"><br /></td>
-</tr>
-<tr align="left">
-  <td class="text">
-    Finanzamt <%FA_Name%><br />
-    <%FA_Strasse%><br />
-    <%FA_PLZ%> <%FA_Ort%><br />
-    Fax: <%FA_FAX%>
-  </td>
-  <td class="text">&nbsp;</td>
-  <td class="text">
-    Firma <%company%><br />
-    <%if company_street%>
-      <%company_street%><br />
-      <%company_city%><br />
-    <%end company_street%>
-    <%if not company_street%>
-    <%address%><!--used Address-->
-    <%end company_street%>
-  </td>
-</tr>
-<tr>
-  <td class="text" colspan="3"><br />
-  </td>
-</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="2">
-  <tbody>
-    <tr>
-      <td class="text"><b class="h3">I. Anmeldung der
-Umsatzsteuer-Vorauszahlung </b></td>
-      <td colspan="4"></td>
-    </tr>
-    <tr>
-      <td class="text"><b class="h4">Lieferungen und sonstige Leistungen</b></td>
-      <td colspan="4"></td>
-    </tr>
-        <tr>
-      <td class="text2">an innergemeinschaftliche Abnehmer <b>mit</b> USt-IdNr</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>41<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%41%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-    <tr>
-      <td class="text">neuer Fahrzeuge an Abnehmer <b>ohne</b> USt-IdNr</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>44<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%44%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-    <tr>
-      <td class="text2">neuer Fahrzeuge au&szlig;erhalb eines Unternehmens</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>49<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%49%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-    <tr>
-      <td class="text">Weitere steuerfreie Ums&auml;tze mit Vorsteuerabzug</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>43<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%43%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-    <tr>
-      <td class="text2">Steuerfreie Ums&auml;tze ohne
-Vorsteuerabzug. </b><br />Ums&auml;tze nach &sect; 4 Nr. 8 bis 20 UStG</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>48<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%48%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-
-    <tr>
-      <td class="text"><b class="h4">Steuerpflichtige Ums&auml;tze</b></td>
-      <td colspan="4"></td>
-    </tr>
-<%if not year2007%>
-    <tr>
-      <td class="text2">zum Steuersatz von 16 v.H.</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>51<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%51%><br></td>
-      <td class="spalte"><span class="nodis">(Spalte 51 rechts)</span></td>
-      <td class="betrag"><%511%></td>
-    </tr>
-<%end year2007%>
-<%if year2007%>
-    <tr>
-      <td class="text2">zum Steuersatz von 19 v.H.</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>81<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%81%><br></td>
-      <td class="spalte"><span class="nodis">(Spalte 81 rechts)</span></td>
-      <td class="betrag"><%811%></td>
-    </tr>
-<%end year2007%>
-
-    <tr>
-      <td class="text">zum Steuersatz von 7 v.H.</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%86%></td>
-      <td class="spalte"><span class="nodis">(Spalte 86 rechts)</span></td>
-      <td class="betrag"><%861%></td>
-    </tr>
-    <tr>
-      <td class="text2">andere Steuers&auml;tze</td>
-      <td class="spalte ausfuellen"><span class="nodis"></span>35 <span class="nodis"></span></td>
-      <td class="betrag ausfuellen"><%35%></td>
-      <td class="spalte">36</td>
-      <td class="betrag ausfuellen"><%36%></td>
-    </tr>
-    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
-   <tr>
-      <td class="text">Lieferungen in das &uuml;brige Gemeinschaftsgebiet <b>mit</b> USt-IdNr</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>77<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%77%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-    <tr>
-      <td class="text2">Ums&auml;tze, nach &sect;24 UStG (S&auml;gewerkserzeugnisse, alkoholische Getr&auml;nke etc.)</td>
-      <td class="spalte ausfuellen"><span class="nodis"></span>76 <span class="nodis"></span></td>
-      <td class="betrag ausfuellen"><%76%></td>
-      <td class="spalte">80</td>
-      <td class="betrag ausfuellen"><%80%></td>
-    </tr>
-    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
-    <tr>
-      <td class="text"><b class="h3">Innergemeinschaftliche Erwerbe</b></td>
-      <td colspan="4"></td>
-    </tr>
-   <tr>
-      <td class="text2">Steuerfrei nach &sect;4b UStG</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>91<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen" width="70"><%91%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-<%if not year2007%>
-    <tr>
-      <td class="text">Steuerpflichtige zum Steuersatz von 16 v.H.</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>97<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%97%><br></td>
-      <td class="spalte"><span class="nodis">(Spalte 97 rechts)</span></td>
-      <td class="betrag"><%971%></td>
-    </tr>
-<%end if year2007%>
-<%if year2007%>
-    <tr>
-      <td class="text">Steuerpflichtige zum Steuersatz von 19 v.H.</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>89<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%89%><br></td>
-      <td class="spalte"><span class="nodis">(Spalte 89 rechts)</span></td>
-      <td class="betrag"><%891%></td>
-    </tr>
-<%end if year2007%>
-    <tr>
-      <td class="text2">zum Steuersatz von 7 v.H.</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>93<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%93%></td>
-      <td class="spalte"><span class="nodis">(Spalte 93 rechts)</span></td>
-      <td class="betrag"><%931%></td>
-    </tr>
-    <tr>
-      <td class="text">zu anderen Steuers&auml;tzen</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>95<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%95%></td>
-      <td class="spalte">98</td>
-      <td class="betrag"><%98%></td>
-    </tr>
-    <tr>
-      <td class="text2"><b class="h4">neuer Fahrzeuge von Lieferern</b>
-             von Lieferanten <b>ohne</b> USt.IdNr. <br class="nodis" />
-	     zum allgemeinen Steuersatz</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>94<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%94%></td>
-      <td class="spalte"><span class="nodis">(Spalte </span>96<span class="nodis">)</span></td>
-      <td class="betrag"><%96%></td>
-    </tr>
-        <tr><td class="text">&nbsp;</td><td colspan="4"></td></tr>
-   <tr>
-      <td class="text">Lieferungen des ersten Abnehmers bei
-        innergemeinschaftlichen Dreiecksgeschften (&sect;25b Abs. 2 UStG)</td>
-      <td class="spalte ausfuellen">42</td>
-      <td class="betrag ausfuellen" width="70"><%42%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-   <tr>
-      <td class="text2">Steuerpflichtige Umstze im Sinne, f&uuml;r die der
-        <b>Leistungsempf&auml;nger die Steuer schuldet</b></td>
-      <td class="spalte ausfuellen">60</td>
-      <td class="betrag ausfuellen" width="70"><%60%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-<%if year2010%>
-   <tr>
-      <td class="text2"><b>Nicht steuerbare Leistungen</b> gem. &sect; 18b Satz 1 Nr. 2 UStG</td>
-      <td class="spalte ausfuellen">21</td>
-      <td class="betrag ausfuellen" width="70"><%21%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-<%end if year2010%>
-   <tr>
-      <td class="text">Im Inland nicht steuerbare Ums&auml;tze</td>
-      <td class="spalte ausfuellen">45</td>
-      <td class="betrag ausfuellen" width="70"><%45%><br></td>
-      <td class="spalte"><span class="nodis"></span></td>
-      <td class="betrag"></td>
-    </tr>
-
-    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="2"></td><td colspan="2"></td></tr>
-
-    <tr>
-      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
-      <td class="zeile"><span class="nodis">(</span>Zeile 43<span class="nodis">)</span></td>
-      <td class="betrag"><%Z43%></td>
-    </tr>
-
-    <tr class="uebertrag">
-      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
-      <td class="zeile"><span class="nodis">(</span>Zeile 45<span class="nodis">)</span></td>
-      <td class="betrag"><%Z45%></td>
-    </tr>
-
-<%if year2010%>
-    <tr>
-      <td class="text2">Im Inland steuerpflichtige sonstige Leistungen von im &uuml;brigen Gemeinschaftsgebiet ans&auml;ssigen Unternehmen (&sect;13b Abs. 1 UStG)</td>
-      <td class="spalte ausfuellen">46</td>
-      <td class="betrag ausfuellen"><%46%></td>
-      <td class="spalte">47</td>
-      <td class="betrag"><%47%></td>
-    </tr>
-<%end if year2010%>
-    <tr>
-      <td class="text2">Leistungen eines im Ausland ans&auml;ssigen Unternehmers</td>
-      <td class="spalte ausfuellen">52</td>
-      <td class="betrag ausfuellen"><%52%></td>
-      <td class="spalte">53</td>
-      <td class="betrag"><%53%></td>
-    </tr>
-    <tr>
-      <td class="text">Lieferungen sicherungsbereigneter Gegenst&auml;nde und
-           Ums&auml;tze, die unter das GrEStG fallen.</td>
-      <td class="spalte ausfuellen">73</td>
-      <td class="betrag ausfuellen"><%73%></td>
-      <td class="spalte">74</td>
-      <td class="betrag"><%74%></td>
-    </tr>
-    <tr>
-      <td class="text2">Bauleistungen eines im Inland ans&auml;ssigen Unternehmers</td>
-      <td class="spalte ausfuellen">84</td>
-      <td class="betrag ausfuellen"><%84%></td>
-      <td class="spalte">85</td>
-      <td class="betrag"><%85%></td>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">Steuer wegen Wechsel der Besteuerungsform und
-         Nachsteuer auf versteuerte Anzahlungen wegen Steuersatzerh&ouml;hung.</td>
-      <td class="spalte ausfuellen">65</td>
-      <td class="betrag ausfuellen"><%65%></td>
-    </tr>
-
-
-
-    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
-
-    <tr>
-      <td class="text2" colspan="3"><b class="h3">Umsatzsteuer</td>
-      <td class="zeile"><span class="nodis">(</span>Zeile 53<span class="nodis">)</span></td>
-      <td class="betrag"><%Z53%></td>
-    </tr>
-
-    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
-
-    <tr>
-      <td class="text" colspan="3"><b class="h3">Abziehbare Vorsteuerbetr&auml;ge</b></td>
-      <td colspan="2"></td></tr>
-    </tr>
-
-    <tr>
-      <td class="text2" colspan="3">Vorsteuerbetr&auml;ge von Rechnungen von anderen Unternehmern</td>
-      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>66<span class="nodis">)</span></td>
-      <td class="betrag ausfuellen"><%66%></td>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">Vorsteuerbetr&auml;ge aus dem innergemeinschaftlichen Erwerb</td>
-      <td class="spalte ausfuellen">61</td>
-      <td class="betrag ausfuellen"><%61%></td>
-    </tr>
-    <tr>
-      <td class="text2" colspan="3">Entrichtete Einfuhrumsatzsteuer</td>
-      <td class="spalte ausfuellen">62</td>
-      <td class="betrag ausfuellen"><%62%></td>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">Vorsteuerbetr&auml;ge aus Leistungen im Sinne
-          des &sect;13b Abs. 1 UStG</td>
-      <td class="spalte ausfuellen">67</td>
-      <td class="betrag ausfuellen"><%67%></td>
-    </tr>
-    <tr>
-      <td class="text2" colspan="3">Vorsteuerbetr&auml;ge, die nach allgemeinen
-           Durchschnitts&auml;stzen berechnet sind </td>
-      <td class="spalte ausfuellen">63</td>
-      <td class="betrag ausfuellen"><%63%></td>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">Berichtigung des Vorsteuerabzugs</td>
-      <td class="spalte ausfuellen">64</td>
-      <td class="betrag ausfuellen"><%64%></td>
-    </tr>
-    <tr>
-      <td class="text2" colspan="3">Vorsteuerabzug f&uuml;r innergemeinschaftliche Lieferungen
-        neuer Fahrzeuge au&szlig;erhalb eines Unternehmens sowie von Kleinunternehmern</td>
-      <td class="spalte ausfuellen">59</td>
-      <td class="betrag ausfuellen"><%59%></td>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">Verbleibender Betrag</td>
-      <td class="zeile"><span class="nodis">(</span>Zeile 62<span class="nodis">)</span></td>
-      <td class="betrag"><%Z62%></td>
-    </tr>
-
-    <tr>
-      <td class="text2" colspan="3"><b class="h3">Andere Steuerbetr&auml;ge</b></td>
-      <td colspan="2"></td></tr>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">in Rechnungen unrichtig oder unberechtigt ausgewiesene
-        Steuerbetr&auml;ge sowie Steuerbetr&auml;ge, die nach
-        &sect;4 Nr. 4a, &sect; 6a Abs. 4, &sect;7 oder &sect;25b UStG geschuldet werden</td>
-      <td class="spalte ausfuellen">69</td>
-      <td class="betrag ausfuellen"><%69%></td>
-    </tr>
-
-    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
-
-    <tr>
-      <td class="text2" colspan="3"><b class="h3">Umsatzsteuer-Vorauszahlung/&Uuml;berschuss</b></td>
-      <td class="zeile"><span class="nodis">(</span>Zeile 65<span class="nodis">)</span></td>
-      <td class="betrag"><%Z65%></td>
-    </tr>
-    <tr>
-      <td class="text" colspan="3">Anrechnung (Abzug) der festgesetzten Sondervorauszahlung
-        f&uuml;r Dauerfristverl&auml;ngerung (nur in der letzten Voranmeldung des
-        Besteuerungszeitraums, ausf&uuml;llen)</td>
-      <td class="spalte ausfuellen">39</td>
-      <td class="betrag ausfuellen"><%39%></td>
-    </tr>
-
-    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
-
-    <tr class="noborder">
-      <td class="text2" colspan="3"><b class="h3">Verbleibende Umsatzsteuer-Vorauszahlung bzw.
-                                      Verbleibender &Uuml;berschuss</b></td>
-      <td class="spalte ausfuellen">83</td>
-      <td class="summe"><%83%></td>
-    </tr>
-
-  </tbody>
-</table>
-<%if FA_steuerberater%>
-<p>
-Steuerberater:<br />
-<%FA_steuerberater_name%><br />
-<%FA_steuerberater_street%><br />
-<%FA_steuerberater_city%><br />
-Tel:&nbsp;<%FA_steuerberater_tel%></p>
-<%end FA_steuerberater%>
-</body>
-</html>
diff --git a/templates/German-ustva.tex b/templates/German-ustva.tex
deleted file mode 100644
index da26f47a8..000000000
--- a/templates/German-ustva.tex
+++ /dev/null
@@ -1,120 +0,0 @@
-% German USTVA template for taxreports
-%
-% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
-\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{0pt}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\hspace{7mm}\protect\includegraphics[viewport = 60 700 700 790]{ustva2.pdf}}
-{\protect\includegraphics[viewport = 60 700 700 790]{ustva1.pdf}}
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- &  \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company_city%>}}& & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%end fax%>
-}& & & &<%FA_10%> &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\end{tabular}\\[28.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\[42mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[46mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[7.9mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[14mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\
-%\multicolumn{2}{||r|}{1000} & & & \\
-%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
-%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
-\end{tabular}
-
-\newpage
-
-\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%45%>}\\[46mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[7.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[7.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[58.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item  <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
diff --git a/templates/German-winston.xml b/templates/German-winston.xml
deleted file mode 100644
index 2bb63da22..000000000
--- a/templates/German-winston.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Diese Datei ist mit Lx-Office <%version%> generiert -->
-<WinstonAusgang>
-  <Formular Typ="UST"></Formular>
-  <Ordnungsnummer><%elsterFFFF%><%elstersteuernummer%></Ordnungsnummer>
-  <AnmeldeJahr><%year%></AnmeldeJahr>
-  <AnmeldeZeitraum><%period%></AnmeldeZeitraum>
-
-<%foreach id%>
-  <Kennzahl nr="<%id%>"><%amount%></Kennzahl>
-<%end%>
-
-</WinstonAusgang>
-
diff --git a/templates/German-zahlungserinnerung.tex b/templates/German-zahlungserinnerung.tex
deleted file mode 100644
index 679f6bd6e..000000000
--- a/templates/German-zahlungserinnerung.tex
+++ /dev/null
@@ -1,62 +0,0 @@
-\documentclass[10pt, oneside]{scrartcl}
-\usepackage[utf8]{inputenc}
-\usepackage{german}
-\usepackage{tabularx}
-\usepackage{xspace}
-\usepackage{ifthen}
-\usepackage{eso-pic}
-\usepackage{longtable}
-\usepackage{eurosym}
-
-\setlength{\voffset}{-0.3cm}
-\setlength{\hoffset}{-2.2cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{2cm}
-%\setlength{\evensidemargin}{2cm}
-\setlength{\textwidth}{16.4cm}
-% \setlength{\textwidth}{13.4cm}
-\setlength{\textheight}{23.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\setlength{\tabcolsep}{0cm}
-
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-\pagestyle{empty}
-\fontfamily{cmss}\fontsize{10pt}{10pt}\fontseries{m}\selectfont
-
-% \vspace*{5cm}
-
-<%name%>
-
-% \ifthenelse{\equal{<%cp_name%>}{}}{}{z.Hd. <%cp_name%>}
-
-<%street%>
-
-<%zipcode%> <%city%>
-
-\begin{flushright}<%dunning_date%>\end{flushright}
-
-\vspace*{2.5cm} %\\
-\large
-\textbf{Zahlungserinnerung} \\ \\ \\
-\normalsize
-Sehr geehrte Damen und Herren, \\ \\ \\
-man kann seine Augen nicht überall haben - offensichtlich haben Sie übersehen, die folgenden Rechnungen zu begleichen: \\
-\vspace{0.5cm} \\
-\begin{tabularx}{\textwidth}{l@{\hspace*{2cm}}X@{\hspace*{0.5cm}}r}
-  \textbf{Rechnungsnummer} & \textbf{Rechnungsdatum} & \textbf{Rechnungsbetrag} \\ \hline && \\
-  <%foreach dn_invnumber%>
-    <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \euro \\[0.1cm]
-  <%end dn_invnumber%>
-\end{tabularx}
-\vspace*{0.5cm} \\
-Wir bitten Sie, diese bis zum <%dunning_duedate%> zu begleichen. \\ \\ \\
-Bitte beachten Sie, dass wir Zahlungseingänge nur bis zum <%dunning_date%> berücksichtigen konnten. Sollten Sie zwischenzeitlich bezahlt haben, betrachten Sie diese Zahlungserinnerung bitte als gegenstandslos. \\ \\ \\
-Mit freundlichen Grüßen, \\ \\ \\ \\
-<%employee_name%>
-\end{document}
diff --git a/templates/German-zahlungserinnerung_invoice.tex b/templates/German-zahlungserinnerung_invoice.tex
deleted file mode 100644
index bc5cfa67e..000000000
--- a/templates/German-zahlungserinnerung_invoice.tex
+++ /dev/null
@@ -1,75 +0,0 @@
-\documentclass[10pt, oneside]{scrartcl}
-\usepackage[utf8]{inputenc}
-\usepackage{german}
-\usepackage{tabularx}
-\usepackage{xspace}
-\usepackage{ifthen}
-\usepackage{eso-pic}
-\usepackage{longtable}
-\usepackage{eurosym}
-
-\setlength{\voffset}{-0.3cm}
-\setlength{\hoffset}{-2.2cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{2cm}
-%\setlength{\evensidemargin}{2cm}
-\setlength{\textwidth}{16.4cm}
-% \setlength{\textwidth}{13.4cm}
-\setlength{\textheight}{23.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\setlength{\tabcolsep}{0cm}
-
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-\pagestyle{empty}
-\fontfamily{cmss}\fontsize{10pt}{10pt}\fontseries{m}\selectfont
-
-<%name%>
-
-<%street%>
-
-<%zipcode%> <%city%>
-
-\begin{flushright}<%invdate%>\end{flushright}
-
-\vspace*{2.5cm}
-
-\large
-\textbf{Rechnung <%invnumber%>}
-
-\vspace*{1cm}
-
-\normalsize
-Sehr geehrte Damen und Herren,
-
-\vspace*{1cm}
-Hiermit stellen wir Ihnen zu Mahnung <%dunning_id%> die folgenden Posten in Rechnung:
-
-\vspace*{0.5cm}
-
-\begin{tabularx}{\textwidth}{Xr}
-  \textbf{Posten} & \multicolumn{1}{l}{\textbf{Betrag}}\\
-  \hline
-  Mahngebühren & <%fee%> EUR \\
-  Zinsen & <%interest%> EUR \\
-  \cline{2-2}
-  Gesamtsumme & <%invamount%> EUR\\
-\end{tabularx}
-
-\vspace*{0.5cm}
-
-Bitte begleichen Sie diese Forderung bis zum <%duedate%>.
-
-\vspace*{0.5cm}
-
-Mit freundlichen Grüßen,
-
-\vspace*{2cm}
-<%employee_name%>
-
-\end{document}
diff --git a/templates/Service-balance_sheet.html b/templates/Service-balance_sheet.html
deleted file mode 100644
index 478caabca..000000000
--- a/templates/Service-balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>BALANCE SHEET
-<br><%period%>
-</h2>
-
-<table border=0>
-<tr>
-  <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
-  <td> </td>
-  <td><%asset_account%></td>
-  <td align=right><%asset_this_period%></td>
-  <td align=right><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL ASSETS</th>
-  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
-  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
-  <td></td>
-  <td><%liability_account%></td>
-  <td align=right><%liability_this_period%></td>
-  <td align=right><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Liabilities</th>
-  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr>
-  <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
-  <td></td>
-  <td><%equity_account%></td>
-  <td align=right><%equity_this_period%></td>
-  <td align=right><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td></td>
-  <th align=left>Total Equity</th>
-  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/Service-check.tex b/templates/Service-check.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/Service-check.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
-  & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/Service-income_statement.html b/templates/Service-income_statement.html
deleted file mode 100644
index e9d6a4002..000000000
--- a/templates/Service-income_statement.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>INCOME STATEMENT
-<br><%period%>
-</h2>
-
-
-<table width=100% border=0>
-<tr>
-  <th width=400 align=left colspan=2>INCOME<br><hr width=300 size=5 align=left noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
-</tr>
-
-<%foreach income_account%>
-<tr>
-  <td width=4> </td>
-  <td><%income_account%></td>
-  <td align=right><%income_this_period%></td>
-  <td align=right><%income_last_period%></td>
-</tr>
-<%end income_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td> </td>
-  <th align=left>Total Income</th>
-  <td align=right><%total_income_this_period%><hr noshade size=2></td>
-  <td align=right><%total_income_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
-  <th align=left colspan=2>EXPENSES<br><hr width=300 size=5 align=left noshade></th>
-</tr>
-
-<%foreach expense_account%>
-<tr>
-  <td> </td>
-  <td><%expense_account%></td>
-  <td align=right><%expenses_this_period%></td>
-  <td align=right><%expenses_last_period%></td>
-</tr>
-<%end expense_account%>
-
-<tr>
-  <td colspan=2> </td>
-  <td><hr noshade size=1></td>
-  <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
-  <td> </td>
-  <th align=left>Total Expenses</th>
-  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
-  <th align=left colspan=2>INCOME / (LOSS)</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-
-</table>
-
-
-
-
-
-
-
-
diff --git a/templates/Service-invoice.html b/templates/Service-invoice.html
deleted file mode 100644
index 47493edd4..000000000
--- a/templates/Service-invoice.html
+++ /dev/null
@@ -1,226 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr>
-  <td width=10>
-  </td> 
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      <br>Tel/Fax <%tel%> / <%fax%>
-      </h4>
-    </td>
-
-    <th colspan=2>
-      <h4 align=center>I N V O I C E</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date</th><td width=10> </td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Number</th><td></td><td><%invnumber%></td></tr>
-    </tr>
-
-<!-- prepared by: <%username%>
--->
-
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>To:</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-      
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td> 
-    </td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Description</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-      <td><%description%></td>
-      <td>&nbsp;</td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=3><hr noshade></td>
-    </tr>
-    
-    <tr>
-<%if taxincluded%>
-      <td>&nbsp;</td>
-      <th align=right>Total</th>
-      <td align=right><%invtotal%></td>
-<%end taxincluded%>
-<%if not taxincluded%>
-      <td>&nbsp;</td>
-      <th align=right>Subtotal</th>
-      <td align=right><%subtotal%></td>
-<%end taxincluded%>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=2 align=right><%taxdescription%></th>
-      <td align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-<!--
-  <%taxbase%> = total netamount for each tax bracket
-  <%taxrate%> = taxrate in percent
--->
-     
-<%if paid%>
-    <tr>
-      <td>&nbsp;</td>
-      <th align=right>Paid</th>
-      <td align=right><%paid%></td>
-    </tr>
-<%end paid%>
-
-    <tr>
-      <td>&nbsp;</td>
-      <td colspan=2><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td>
-<%if terms%>
-Terms &nbsp;Net <b><%terms%></b> days
-<%end terms%>
-</td>
-      <th align=right>Total</th>
-      <th align=right><%total%></th>
-    </tr>
-    
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<%if notes%>
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-      <td align=right>
-      &nbsp;
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-<%end notes%>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <th colspan=3>
-  Please make check payable to <%company%>
-  <br>Thank you for your valued business!
-  </th>
-</tr>
-
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Payment due NET <%terms%> Days from date of Invoice.
-    Interest on overdue amounts will acrue at the rate of 1.5% per month
-    from due date until paid in full.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=3 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
-    </tr>
-<%end tax%>
-
-<!--
-  %username% = user name
-  %businessnumber% = business number
--->
-
-<!-- banking information
-    <tr>
-      <th colspan=3 align=left><font size=-2>Banking Information:
-      <br>Bank
-      <br>Transit No.
-      <br>Account No.
-      </th>
-    </tr>
--->
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Service-invoice.tex b/templates/Service-invoice.tex
deleted file mode 100644
index 3ea270332..000000000
--- a/templates/Service-invoice.tex
+++ /dev/null
@@ -1,151 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\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 <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{I N V O I C E}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Number} & <%invnumber%> \\
-  \textbf{Customer} & <%customer_id%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-<%foreach number%>
-  <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%> \\
-<%end tax%>
-<%if paid%>
-  \textbf{Paid} & - <%paid%> \\
-<%end paid%>
-  \hline
-  \textbf{Balance Owing} & \textbf{<%total%>} \\
-
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\vfill
-\centerline{\textbf{Thank You for your valued business!}}
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\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.
-}
-
-\end{document}
-
-
diff --git a/templates/Service-purchase_order.html b/templates/Service-purchase_order.html
deleted file mode 100644
index 30d752193..000000000
--- a/templates/Service-purchase_order.html
+++ /dev/null
@@ -1,194 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telephone: <%tel%>
-      <br>Facsimile: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>P U R C H A S E &nbsp;&nbsp; O R D E R</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>To:</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Price</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=6><hr noshade></td>
-    </tr>
-    
-    <tr>
-      <th colspan=4 align=right>Subtotal</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=2>Terms Net <b><%terms%></b> days</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%total%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      All prices in <b><%currency%></b> Funds
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Payment due NET <%terms%> Days from date of Invoice.
-    Interest on overdue amounts will acrue at the rate of 1.5% per month
-    from due date 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.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Service-purchase_order.tex b/templates/Service-purchase_order.tex
deleted file mode 100644
index 34e63523a..000000000
--- a/templates/Service-purchase_order.tex
+++ /dev/null
@@ -1,143 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\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 <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{P U R C H A S E} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%orddate%> \\
-<%if reqdate%>
-  \textbf{Required by} & <%reqdate%> \\
-<%end reqdate%>
-  \textbf{Number} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-
-%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-%\footnotetext[1]{\tiny }
-
-\end{document}
-
-
diff --git a/templates/Service-receipt.tex b/templates/Service-receipt.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/Service-receipt.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
-  <%company%>
-
-  <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
-  & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/Service-sales_order.html b/templates/Service-sales_order.html
deleted file mode 100644
index 0a2ffe84f..000000000
--- a/templates/Service-sales_order.html
+++ /dev/null
@@ -1,198 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
-  <td width=10>&nbsp;</td>
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <td align=right>
-      <h4>
-      Telelephone: <%tel%>
-      <br>Facsimile: <%fax%>
-      </h4>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h4>S A L E S &nbsp;&nbsp; O R D E R</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
-    </tr>
-
-    <tr>
-      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>To:</th>
-    </tr>
-
-    <tr>
-      <td><%name%>
-      <br><%street%>
-      <br><%zipcode%>
-      <br><%city%>
-      <br><%country%>
-<%if contact%>
-      <p>Attn: <%contact%>
-%end contact%>
-
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-<!--      <th align=right><font color=ffffff>No.</th>  -->
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Price</th>
-      <th><font color=ffffff>Amount</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-<!--      <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-      <td align=right><%sellprice%></td>
-      <td align=right><%linetotal%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=6><hr noshade></td>
-    </tr>
-    
-    <tr>
-      <th colspan=4 align=right>Subtotal</th>
-      <td colspan=2 align=right><%subtotal%></td>
-    </tr>
-
-<%foreach tax%>
-    <tr>
-      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
-      <td colspan=2 align=right><%tax%></td>
-    </tr>
-<%end tax%>
-
-    <tr>
-      <td colspan=2>&nbsp;</td>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=2>Terms Net <b><%terms%></b> days</td>
-      <th colspan=2 align=right>Total</th>
-      <th colspan=2 align=right><%total%></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      All prices in <b><%currency%></b> Funds
-      <br><%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-  
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Payment due NET <%terms%> Days from date of Invoice.
-    Interest on overdue amounts will acrue at the rate of 1.5% per month
-    from due date 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.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Service-sales_order.tex b/templates/Service-sales_order.tex
deleted file mode 100644
index e036d5341..000000000
--- a/templates/Service-sales_order.tex
+++ /dev/null
@@ -1,142 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\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 <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{S A L E S} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%orddate%> \\
-<%if reqdate%>
-  \textbf{Required by} & <%reqdate%> \\
-<%end reqdate%>
-  \textbf{Number} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-<%foreach number%>
-  <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
-  <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
-  \hline
-  \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
-  All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-
-%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-%\footnotetext[1]{\tiny }
-
-\end{document}
-
diff --git a/templates/Service-statement.html b/templates/Service-statement.html
deleted file mode 100644
index 441e6e0d1..000000000
--- a/templates/Service-statement.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-  <tr>
-    <td width=10>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr>
-	  <td>
-	    <h4>
-	    <%company%>
-	    <br><%address%>
-	    </h4>
-	  </td>
-	  <th><img src=http://www.sql-ledger.org/images/sql-ledger.png border=0 width=64 height=58></th>
-	  <td align=right>
-	  <h4>
-	  Tel: <%tel%>
-	  <br>Fax: <%fax%>
-	  </h4>
-	  </td>
-	</tr>
-	<tr>
-	  <th colspan=3><h4>S T A T E M E N T</h4></th>
-	</tr>
-	<tr>
-	  <td colspan=3 align=right><%statementdate%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-	<tr valign=top>
-	  <td><%name%>
-	  <br><%street%>
-	  <br><%zipcode%>
-	  <br><%city%>
-	  <br><%country%>
-	  <br>
-<%if customerphone%>
-	  <br>Tel: <%customerphone%>
-<%end customerphone%>
-<%if customerfax%>
-	  <br>Fax: <%customerfax%>
-<%end customerfax%>
-<%if email%>
-	  <br><%email%>
-<%end email%>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>
-      <table width=100%>
-        <tr>
-	  <th align=left>Invoice #</th>
-	  <th width=15%>Date</th>
-	  <th width=15%>Due</th>
-	  <th width=10%>Current</th>
-	  <th width=10%>30</th>
-	  <th width=10%>60</th>
-	  <th width=10%>90+</th>
-	</tr>
-<%foreach invnumber%>
-	<tr>
-	  <td><%invnumber%></td>
-	  <td><%invdate%></td>
-	  <td><%duedate%></td>
-	  <td align=right><%c0%></td>
-	  <td align=right><%c30%></td>
-	  <td align=right><%c60%></td>
-	  <td align=right><%c90%></td>
-	</tr>
-<%end invnumber%>
-        <tr>
-	  <td colspan=7><hr size=1></td>
-	</tr>
-	<tr>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <td>&nbsp;</td>
-	  <th align=right><%c0total%></td>
-	  <th align=right><%c30total%></td>
-	  <th align=right><%c60total%></td>
-	  <th align=right><%c90total%></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr height=10></tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td align=right>
-      <table width=50%>
-        <tr>
-	  <th>Total Outstanding</th>
-          <th align=right><%total%></th>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><hr noshade></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>Please make check payable to <b><%company%></b>.
-    </td>
-  </tr>
-  <tr height=20></tr>
-</table>
-
diff --git a/templates/Service-statement.tex b/templates/Service-statement.tex
deleted file mode 100644
index 23ebf781e..000000000
--- a/templates/Service-statement.tex
+++ /dev/null
@@ -1,137 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-
-      <%address%>}\hfill
-    \begin{tabular}[b]{rrr@{}}
-    Tel & <%tel%>\\
-    Fax & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
-
-\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}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-  
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-}
-\parbox[t]{7.5cm}{
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{S T A T E M E N T} \hfill
-
-\hfill <%statementdate%>
-
-\vspace{2cm}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-<%foreach invnumber%>
-  <%invnumber%> & <%invdate%> & <%duedate%> &
-  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
-\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
-\end{tabular*}
-\rule{\textwidth}{1pt}
-
-\vspace{1cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Total outstanding} & <%total%>
-\end{tabularx}
-
-\vfill
-
-Please make check payable to <%company%>
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-}
-
-\end{document}
-
diff --git a/templates/mastertemplates/Default/balance_sheet.html b/templates/mastertemplates/Default/balance_sheet.html
new file mode 100644
index 000000000..478caabca
--- /dev/null
+++ b/templates/mastertemplates/Default/balance_sheet.html
@@ -0,0 +1,100 @@
+
+<body bgcolor=ffffff>
+
+<h2 align=center>
+<%company%>
+<br><%address%>
+
+<p>BALANCE SHEET
+<br><%period%>
+</h2>
+
+<table border=0>
+<tr>
+  <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach asset_account%>
+<tr>
+  <td> </td>
+  <td><%asset_account%></td>
+  <td align=right><%asset_this_period%></td>
+  <td align=right><%asset_last_period%></td>
+</tr>
+<%end asset_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>TOTAL ASSETS</th>
+  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
+  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
+</tr>
+
+<tr>
+  <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
+</tr>
+
+<%foreach liability_account%>
+<tr>
+  <td></td>
+  <td><%liability_account%></td>
+  <td align=right><%liability_this_period%></td>
+  <td align=right><%liability_last_period%></td>
+</tr>
+<%end liability_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td></td>
+  <th align=left>Total Liabilities</th>
+  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr>
+  <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
+</tr>
+
+<%foreach equity_account%>
+<tr>
+  <td></td>
+  <td><%equity_account%></td>
+  <td align=right><%equity_this_period%></td>
+  <td align=right><%equity_last_period%></td>
+</tr>
+<%end equity_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td></td>
+  <th align=left>Total Equity</th>
+  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
+  <td align=right><%total_this_period%><br><hr noshade size=2></td>
+  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+</tr>
+</table>
+
+
+
diff --git a/templates/mastertemplates/Default/bin_list.html b/templates/mastertemplates/Default/bin_list.html
new file mode 100644
index 000000000..feed5696b
--- /dev/null
+++ b/templates/mastertemplates/Default/bin_list.html
@@ -0,0 +1,181 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	    <h4>
+	    <%company%>
+	    <br><%address%>
+	    </h4>
+	  </td>
+	  
+	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+	  <th align=right>
+	    <h4>
+	    Tel: <%tel%>
+	    <br>Fax: <%fax%>
+	    </h4>
+	  </td>
+	</tr>
+	
+	<tr>
+	  <th colspan=3>
+	    <h4>B I N &nbsp;&nbsp; L I S T</h4>
+	  </th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% cellspacing=0 cellpadding=0>
+	<tr bgcolor=000000>
+	  <th align=left width=50%><font color=ffffff>From</th>
+	  <th align=left width=50%><font color=ffffff>Ship To</th>
+	</tr>
+
+	<tr valign=top>
+	  <td><%name%>
+	  <br><%street%>
+	  <br><%zipcode%>
+	  <br><%city%>
+	  <br><%country%>
+	  <br>
+
+	  <%if contact%>
+	  <br>Attn: <%contact%>
+	  <%end contact%>
+
+	  <%if vendorphone%>
+	  <br>Tel: <%vendorphone%>
+	  <%end vendorphone%>
+
+	  <%if vendorfax%>
+	  <br>Fax: <%vendorfax%>
+	  <%end vendorfax%>
+
+	  <%if email%>
+	  <br><%email%>
+	  <%end email%>
+	  
+	  </td>
+	  
+	  <td><%shiptoname%>
+	  <br><%shiptostreet%>
+	  <br><%shiptozipcode%>
+	  <br><%shiptocity%>
+	  <br><%shiptocountry%>
+
+	  <br>
+	  <%if shiptocontact%>
+	  <br>Attn: <%shiptocontact%>
+	  <%end shiptocontact%>
+	  
+	  <%if shiptophone%>
+	  <br>Tel: <%shiptophone%>
+	  <%end shiptophone%>
+
+	  <%if shiptofax%>
+	  <br>Fax: <%shiptofax%>
+	  <%end shiptofax%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr height=5></tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% border=1>
+	<tr>
+	  <th width=17% align=left nowrap>Order #</th>
+	  <th width=17% align=left nowrap>Date</th>
+	  <th width=17% align=left nowrap>Contact</th>
+	  <%if warehouse%>
+	  <th width=17% align=left nowrap>Warehouse</th>
+	  <%end warehouse%>
+	  <th width=17% align=left>Shipping Point</th>
+	  <th width=15% align=left>Ship via</th>
+	</tr>
+
+	<tr>
+	  <td><%ordnumber%>&nbsp;</td>
+	  
+	  <%if shippingdate%>
+	  <td><%shippingdate%></td>
+	  <%end shippingdate%>
+	  
+	  <%if not shippingdate%>
+	  <td><%orddate%></td>
+	  <%end shippingdate%>
+	  
+	  <td><%employee%>&nbsp;</td>
+
+	  <%if warehouse%>
+	  <td><%warehouse%></td>
+	  <%end warehouse%>
+  
+	  <td><%shippingpoint%>&nbsp;</td>
+	  <td><%shipvia%>&nbsp;</td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100%>
+	<tr bgcolor=000000>
+	  <th align=left><font color=ffffff>Pos</th>
+	  <th align=left><font color=ffffff>Number</th>
+	  <th align=left><font color=ffffff>Description</th>
+	  <th><font color=ffffff>Serialnumber</th>
+	  <th>&nbsp;</th>
+	  <th><font color=ffffff>Qty</th>
+	  <th><font color=ffffff>Recd</th>
+	  <th>&nbsp;</th>
+	  <th><font color=ffffff>Bin</th>
+	</tr>
+
+	<%foreach number%>
+	<tr valign=top>
+	  <td><%runningnumber%></td>
+	  <td><%number%></td>
+	  <td><%description%></td>
+	  <td><%serialnumber%></td>
+	  <td><%deliverydate%></td>
+	  <td align=right><%qty%></td>
+	  <td align=right><%ship%></td>
+	  <td><%unit%></td>
+	  <td><%bin%></td>
+	</tr>
+	<%end number%>
+
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td><hr noshade></td>
+  </tr>
+
+</table>
+
diff --git a/templates/mastertemplates/Default/bin_list.tex b/templates/mastertemplates/Default/bin_list.tex
new file mode 100644
index 000000000..b7cc8cf3a
--- /dev/null
+++ b/templates/mastertemplates/Default/bin_list.tex
@@ -0,0 +1,128 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\usepackage{graphicx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+
+\begin{document}
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{-1.3cm}
+
+\parbox{\textwidth}{
+  \parbox[b]{.42\textwidth}{%
+    <%company%>
+    
+    <%address%>
+  }\hfill
+  \begin{tabular}[b]{rr@{}}
+  Telephone & <%tel%>\\
+  Facsimile & <%fax%>
+  \end{tabular}
+
+  \rule[1.5ex]{\textwidth}{0.5pt}
+}
+
+ 
+<%pagebreak 90 27 37%>
+\end{tabularx}
+
+\newpage
+
+\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
+  \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.5\textwidth}{
+\textbf{From}
+\vspace{0.7cm}
+
+<%name%> \\
+<%street%> \\
+<%zipcode%> \\
+<%city%> \\
+<%country%>
+}
+\parbox[t]{.4\textwidth}{
+\textbf{Ship To}
+\vspace{0.7cm}
+
+<%shiptoname%> \\
+<%shiptostreet%> \\
+<%shiptozipcode%> \\
+<%shiptocity%> \\
+<%shiptocountry%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{B I N} \parbox{0.3cm}{\hfill} \textbf{L I S T}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
+  <%if warehouse%>
+  & \textbf{Warehouse}
+  <%end warehouse%>
+  & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
+  \hline
+  
+  <%ordnumber%>
+  <%if shippingdate%>
+  & <%shippingdate%>
+  <%end shippingdate%>
+  <%if not shippingdate%>
+  & <%orddate%>
+  <%end shippingdate%>
+  & <%employee%>
+  <%if warehouse%>
+  & <%warehouse%>
+  <%end warehouse%>
+  & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
+  
+\vspace{1cm}
+  
+\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
+  \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
+
+<%foreach number%>
+  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
+  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
+<%end number%>
+\end{tabularx}
+
+
+\rule{\textwidth}{2pt}
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/check.tex b/templates/mastertemplates/Default/check.tex
new file mode 100644
index 000000000..4f97660be
--- /dev/null
+++ b/templates/mastertemplates/Default/check.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Invoice No.} & \textbf{Invoice Date}
+  & \textbf{Due} & \textbf{Applied} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/income_statement.html b/templates/mastertemplates/Default/income_statement.html
new file mode 100644
index 000000000..e9d6a4002
--- /dev/null
+++ b/templates/mastertemplates/Default/income_statement.html
@@ -0,0 +1,82 @@
+
+<body bgcolor=ffffff>
+
+<h2 align=center>
+<%company%>
+<br><%address%>
+
+<p>INCOME STATEMENT
+<br><%period%>
+</h2>
+
+
+<table width=100% border=0>
+<tr>
+  <th width=400 align=left colspan=2>INCOME<br><hr width=300 size=5 align=left noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach income_account%>
+<tr>
+  <td width=4> </td>
+  <td><%income_account%></td>
+  <td align=right><%income_this_period%></td>
+  <td align=right><%income_last_period%></td>
+</tr>
+<%end income_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td> </td>
+  <th align=left>Total Income</th>
+  <td align=right><%total_income_this_period%><hr noshade size=2></td>
+  <td align=right><%total_income_last_period%><hr noshade size=2></td>
+</tr>
+
+<tr>
+  <th align=left colspan=2>EXPENSES<br><hr width=300 size=5 align=left noshade></th>
+</tr>
+
+<%foreach expense_account%>
+<tr>
+  <td> </td>
+  <td><%expense_account%></td>
+  <td align=right><%expenses_this_period%></td>
+  <td align=right><%expenses_last_period%></td>
+</tr>
+<%end expense_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td> </td>
+  <th align=left>Total Expenses</th>
+  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>INCOME / (LOSS)</th>
+  <td align=right><%total_this_period%><br><hr noshade size=2></td>
+  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+</tr>
+
+</table>
+
+
+
+
+
+
+
+
diff --git a/templates/mastertemplates/Default/invoice.html b/templates/mastertemplates/Default/invoice.html
new file mode 100644
index 000000000..b44981bce
--- /dev/null
+++ b/templates/mastertemplates/Default/invoice.html
@@ -0,0 +1,309 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telephone: <%tel%>
+      <br>Facsimile: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>I N V O I C E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Invoice Date</th><td width=10>&nbsp;</td><td><%invdate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Due Date</th><td width=10>&nbsp;</td><td><%duedate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Number</th><td>&nbsp;</td><td><%invnumber%></td></tr>
+    </tr>
+  
+<!--
+    <tr>
+      <th align=right>Clerk:</th><td>&nbsp;</td><td><%employee%></td>
+    </tr>
+-->
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>To:</th>
+      <th align=left><font color=ffffff>Ship To:</th>
+    </tr>
+
+<!--
+     other variables which can be use:
+     contact, shiptocontact, shiptophone, shiptofax
+-->
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+      
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Number</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qt'y</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Price</th>
+      <th><font color=ffffff>Disc</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+<!--
+you can also use netprice instead of sellprice if you
+don't want to show the discount
+netprice = sellprice - discount
+-->
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+    <tr>
+<%if taxincluded%>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%invtotal%></td>
+<%end taxincluded%>
+<%if not taxincluded%>
+      <th colspan=5 align=right>Subtotal</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+<%if paid%>
+    <tr>
+      <th colspan=5 align=right>Paid</th>
+      <td colspan=2 align=right>- <%paid%></td>
+    </tr>
+<%end paid%>
+
+    <tr>
+      <td colspan=3>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>Terms Net <b><%terms%></b> days</td>
+      <th colspan=2 align=right>Outstanding</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Notes</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      All prices in <b><%currency%></b> Funds
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<%if paid%>
+<tr>
+  <td colspan=7>
+    <table width=60%>
+      <tr>
+        <th align=left>Payments</th>
+      </tr>
+      <tr>
+        <td colspan=4>
+	  <hr noshade>
+	</td>
+      </tr>
+      <tr>
+        <th align=left>Date</th>
+	<th align=left>Account</th>
+	<th align=left>Source</th>
+	<th align=left>Amount</th>
+      </tr>
+<%end paid%>
+
+<%foreach payment%>
+      <tr>
+        <td><%paymentdate%></td>
+	<td><%paymentaccount%></td>
+	<td><%paymentsource%></td>
+	<td><%payment%></td>
+      </tr>
+<%end payment%>
+
+<%if paid%>
+    </table>
+  </td>
+</tr>
+
+<tr>
+  <td>&nbsp;</td>
+</tr>
+<%end paid%>
+
+<tr>
+  <th colspan=7>
+  <br>Thank you for your valued business!
+  </th>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Payment due NET <%terms%> Days from date of Invoice.
+    Interest on overdue amounts will acrue at the rate of 1.5% per month
+    from due date 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.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+<%foreach tax%>
+  <tr>
+    <th colspan=7 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
+  </tr>
+<%end tax%>
+
+<%if taxincluded%>
+  <tr>
+    <th colspan=7 align=left><font size=-2>Taxes shown are included in price.</th>
+  </tr>
+<%end taxincluded%>
+
+<!-- business number
+  <tr>
+    <th colspan=7 align=left><font size=-2>Business Number: <%businessnumber%></font></th>
+  </tr>
+-->
+
+<!-- banking information
+  <tr>
+    <th colspan=7 align=left>Banking Information:
+    <br>Bank
+    <br>Transit No.
+    <br>Account No.
+    </td>
+  </tr>
+-->
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Default/invoice.tex b/templates/mastertemplates/Default/invoice.tex
new file mode 100644
index 000000000..7b74fed04
--- /dev/null
+++ b/templates/mastertemplates/Default/invoice.tex
@@ -0,0 +1,231 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Telephone & <%tel%>\\
+    Facsimile & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
+
+\pagestyle{myheadings}
+%\thispagestyle{empty}     use this with letterhead paper
+
+<%pagebreak 90 27 37%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+  
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markright{<%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%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+  \parbox[t]{10.5cm}{
+  \textbf{To}
+  \vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{0.3cm}
+
+%<%if contact%>
+%Attn: <%contact%>
+%\vspace{0.3cm}
+%<%end contact%>
+\vspace{0.5cm}
+
+<%if customerphone%>
+Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+Fax: <%customerfax%>
+<%end customerfax%>
+
+<%email%>
+}
+\parbox[t]{7.5cm}{
+\textbf{Ship To}
+\vspace{0.5cm}
+
+<%shiptoname%>
+
+<%shiptostreet%>
+
+<%shiptozipcode%>
+
+<%shiptocity%>
+
+<%shiptocountry%>
+
+\vspace{0.3cm}
+
+\vspace{0.3cm}
+
+<%if shiptocontact%>
+Attn: <%shiptocontact%>
+\vspace{0.3cm}
+<%end shiptocontact%>
+
+<%if shiptophone%>
+Tel: <%shiptophone%>
+<%end shiptophone%>
+
+<%if shiptofax%>
+Fax: <%shiptofax%>
+<%end shiptofax%>
+
+<%shiptoemail%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{I N V O I C E}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date} & <%invdate%> \\
+  \textbf{Number} & <%invnumber%> \\
+  \textbf{Order} & <%ordnumber%> \\
+  \textbf{Clerk} & <%employee%>
+\end{tabular}
+
+\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} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%> \\
+<%end tax%>
+<%if paid%>
+  \textbf{Paid} & - <%paid%> \\
+<%end paid%>
+  \hline
+  \textbf{Balance Owing} & \textbf{<%total%>} \\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>} funds.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+\vfill
+
+<%if paid%>
+\begin{tabularx}{10cm}{@{}lXlr@{}}
+  \textbf{Payments} & & & \\
+  \hline
+  \textbf{Date} & \textbf{Account} & \textbf{Source} & \textbf{Amount} \\
+<%end paid%>
+<%foreach payment%>
+  <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%payment%> \\
+<%end payment%>
+<%if paid%>
+\end{tabularx}
+<%end paid%>
+
+\vspace{1cm}
+
+\centerline{\textbf{Thank You for your valued business!}}
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\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.}
+
+\end{document}
+
+
+
diff --git a/templates/mastertemplates/Default/pick_list.html b/templates/mastertemplates/Default/pick_list.html
new file mode 100644
index 000000000..365ccc161
--- /dev/null
+++ b/templates/mastertemplates/Default/pick_list.html
@@ -0,0 +1,154 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	  <h4>
+	  <%company%>
+	  <br><%address%>
+	  </h4>
+	  </td>
+
+	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+	  <td align=right>
+	  <h4>
+	  Tel: <%tel%>
+	  <br>Fax: <%fax%>
+	  </h4>
+	  </td>
+	</tr>
+
+	<tr>
+	  <th colspan=3>
+	    <h4>P I C K &nbsp;&nbsp; L I S T</h4>
+	  </th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% callspacing=0 cellpadding=0>
+        <tr bgcolor=000000>
+	  <th width=50% align=left><font color=ffffff>Ship To:</th>
+	  <th width=50%>&nbsp;</th>
+	</tr>
+
+	<tr valign=top>
+	  <td><%shiptoname%>
+	  <br><%shiptostreet%>
+	  <br><%shiptozipcode%>
+	  <br><%shiptocity%>
+	  <br><%shiptocountry%>
+	  </td>
+
+	  <td>
+	  <%if shiptocontact%>
+	  <br>Attn: <%shiptocontact%>
+	  <%end shiptocontact%>
+
+	  <%if shiptophone%>
+	  <br>Tel: <%shiptophone%>
+	  <%end shiptophone%>
+
+	  <%if shiptofax%>
+	  <br>Fax: <%shiptofax%>
+	  <%end shiptofax%>
+
+	  <%shiptoemail%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr height=5></tr>
+  
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% border=1>
+        <tr>
+	  <th width=17% align=left>Order #</th>
+	  <th width=17% align=left>Date</th>
+	  <th width=17% align=left nowrap>Contact</th>
+	  <%if warehouse%>
+	  <th width=17% align=left>Warehouse</th>
+	  <%end warehouse%>
+	  <th width=17% align=left>Shipping Point</th>
+	  <th width=15% align=left>Ship via</th>
+	</tr>
+
+        <tr>
+	  <td><%ordnumber%>&nbsp;</td>
+
+	  <%if shippingdate%>
+	  <td><%shippingdate%></td>
+	  <%end shippingdate%>
+
+	  <%if not shippingdate%>
+	  <td><%orddate%></td>
+	  <%end shippingdate%>
+
+	  <td><%employee%>&nbsp;</td>
+	  
+	  <%if warehouse%>
+	  <td><%warehouse%>&nbsp;</td>
+	  <%end warehouse%>
+	  
+	  <td><%shippingpoint%>&nbsp;</td>
+	  <td><%shipvia%>&nbsp;</td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+	<tr bgcolor=000000>
+	  <th align=left><font color=ffffff>Pos</th>
+	  <th align=left><font color=ffffff>Number</th>
+	  <th align=left><font color=ffffff>Description</th>
+	  <th><font color=ffffff>Qty</th>
+	  <th><font color=ffffff>Ship</th>
+	  <th>&nbsp;</th>
+	  <th><font color=ffffff>Bin</th>
+	</tr>
+
+        <%foreach number%>
+	<tr valign=top>
+	  <td><%runningnumber%>
+	  <td><%number%></td>
+	  <td><%description%></td>
+	  <td align=right><%qty%></td>
+	  <td align=right>[&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]</td>
+	  <td><%unit%></td>
+	  <td align=right><%bin%></td>
+	</tr>
+	<%end number%>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td><hr noshade></td>
+  </tr>
+
+</table>
+
diff --git a/templates/mastertemplates/Default/pick_list.tex b/templates/mastertemplates/Default/pick_list.tex
new file mode 100644
index 000000000..e30d04c77
--- /dev/null
+++ b/templates/mastertemplates/Default/pick_list.tex
@@ -0,0 +1,142 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\usepackage{graphicx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\vspace*{-1.3cm}
+
+\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.5ex]{\textwidth}{0.5pt}
+}
+
+ 
+<%pagebreak 90 27 37%>
+\end{tabular*}
+
+\newpage
+
+\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
+  \textbf{Pos} & \textbf{Number} & \textbf{Description} &
+  \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.5\textwidth}{
+  \textbf{Ship To}
+} \hfill
+
+\vspace{0.7cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.5\textwidth}{
+  
+<%shiptoname%> \\
+<%shiptostreet%> \\
+<%shiptozipcode%> \\
+<%shiptocity%> \\
+<%shiptocountry%>
+}
+\parbox[t]{.4\textwidth}{
+  <%shiptocontact%>
+
+  <%if shiptophone%>
+  Tel: <%shiptophone%>
+  <%end shiptophone%>
+
+  <%if shiptofax%>
+  Fax: <%shiptofax%>
+  <%end shiptofax%>
+
+  <%shiptoemail%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{P I C K} \parbox{0.3cm}{\hfill} \textbf{L I S T}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
+  <%if warehouse%>
+  & \textbf{Warehouse}
+  <%end warehouse%>
+  & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
+  \hline
+  <%ordnumber%>
+  <%if shippingdate%>
+  & <%shippingdate%>
+  <%end shippingdate%>
+  <%if not shippingdate%>
+  & <%orddate%>
+  <%end shippingdate%>
+  & <%employee%>
+  <%if warehouse%>
+  & <%warehouse%>
+  <%end warehouse%>
+  & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
+  
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
+  \textbf{Pos} & \textbf{Number} & \textbf{Description} &
+  \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
+<%foreach number%>
+  <%runningnumber%> & <%number%> & <%description%> &
+  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/purchase_order.html b/templates/mastertemplates/Default/purchase_order.html
new file mode 100644
index 000000000..312ffc67d
--- /dev/null
+++ b/templates/mastertemplates/Default/purchase_order.html
@@ -0,0 +1,224 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telephone: <%tel%>
+      <br>Facsimile: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>P U R C H A S E &nbsp;&nbsp; O R D E R</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left width=50%><font color=ffffff>To:</th>
+      <th align=left width=50%><font color=ffffff>Ship To:</th>
+    </tr>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+
+<br>
+<%if contact%>
+<br>Attn: <%contact%>
+<%end contact%>
+<%if vendorphone%>
+<br>Tel: <%vendorphone%>
+<%end vendorphone%>
+<%if vendorfax%>
+<br>Fax: <%vendorfax%>
+<%end vendorfax%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+
+<br>
+<%if shiptocontact%>
+<br>Attn: <%shiptocontact%>
+<%end shiptocontact%>
+<%if shiptophone%>
+<br>Tel: <%shiptophone%>
+<%end shiptophone%>
+<%if shiptofax%>
+<br>Fax: <%shiptofax%>
+<%end shiptofax%>
+
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Number</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qt'y</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Price</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=6><hr noshade></td>
+    </tr>
+    
+    <tr>
+      <th colspan=4 align=right>Subtotal</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=2>Terms Net <b><%terms%></b> days</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%ordtotal%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Notes</td>
+      <td><pre><%notes%></pre></td>
+<%end notes%>
+      <td align=right>
+      All prices in <b><%currency%></b> Funds
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Payment due NET <%terms%> Days from date of Invoice.
+    Interest on overdue amounts will acrue at the rate of 1.5% per month
+    from due date 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.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Default/purchase_order.tex b/templates/mastertemplates/Default/purchase_order.tex
new file mode 100644
index 000000000..bb4c2a810
--- /dev/null
+++ b/templates/mastertemplates/Default/purchase_order.tex
@@ -0,0 +1,198 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Telephone & <%tel%>\\
+    Facsimile & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
+
+\pagestyle{myheadings}
+%\thispagestyle{empty}     use this with letterhead paper
+
+<%pagebreak 90 27 37%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+  
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markright{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{10.5cm}{
+\textbf{To}
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{0.3cm}
+
+<%if contact%>
+Attn: <%contact%>
+\vspace{0.3cm}
+<%end contact%>
+
+<%if vendorphone%>
+Tel: <%vendorphone%>
+<%end vendorphone%>
+
+<%if vendorfax%>
+Fax: <%vendorfax%>
+<%end vendorfax%>
+
+<%email%>
+}
+\parbox[t]{7.5cm}{
+\textbf{Ship To}
+\vspace{0.5cm}
+
+<%shiptoname%>
+
+<%shiptostreet%>
+
+<%shiptozipcode%>
+
+<%shiptocity%>
+
+<%shiptocountry%>
+
+\vspace{0.3cm}
+
+<%if shiptocontact%>
+Attn: <%shiptocontact%>
+\vspace{0.3cm}
+<%end shiptocontact%>
+
+<%if shiptophone%>
+Tel: <%shiptophone%>
+<%end shiptophone%>
+
+<%if shiptofax%>
+Fax: <%shiptofax%>
+<%end shiptofax%>
+
+<%shiptoemail%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{P U R C H A S E} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Required by} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Number} & <%ordnumber%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%ordtotal%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>} funds.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+
+%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+%\footnotetext[1]{\tiny }
+
+\end{document}
+
+
diff --git a/templates/mastertemplates/Default/receipt.tex b/templates/mastertemplates/Default/receipt.tex
new file mode 100644
index 000000000..4f97660be
--- /dev/null
+++ b/templates/mastertemplates/Default/receipt.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Invoice No.} & \textbf{Invoice Date}
+  & \textbf{Due} & \textbf{Applied} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/request_quotation.html b/templates/mastertemplates/Default/request_quotation.html
new file mode 100644
index 000000000..c1980fd04
--- /dev/null
+++ b/templates/mastertemplates/Default/request_quotation.html
@@ -0,0 +1,194 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58>
+    </td>
+
+    <td align=right>
+      <h4>
+      Tel: <%tel%>
+      <br>Fax: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>R E Q U E S T &nbsp;&nbsp; F O R &nbsp;&nbsp; Q U O T A T I O N</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left width=50%><font color=ffffff>To:</th>
+      <th align=left width=50%><font color=ffffff>Ship To:</th>
+    </tr>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<br>
+<%if contact%>
+<br>Attn: <%contact%>
+<%end contact%>
+<%if vendorphone%>
+<br>Tel: <%vendorphone%>
+<%end vendorphone%>
+<%if vendorfax%>
+<br>Fax: <%vendorfax%>
+<%end vendorfax%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+<br>
+<%if shiptocontact%>
+<br>Attn: <%shiptocontact%>
+<%end shiptocontact%>
+<%if shiptophone%>
+<br>Tel: <%shiptophone%>
+<%end shiptophone%>
+<%if shiptofax%>
+<br>Fax: <%shiptofax%>
+<%end shiptofax%>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr><td>&nbsp;</td></tr>
+  
+  <tr>
+    <td colspan=2>
+    <table width=100% border=1>
+    <tr>
+      <th width=17% align=left>RFQ #</th>
+      <th width=17% align=left>Date</th>
+      <th width=17% align=left>Required by</th>
+      <th width=17% align=left>Contact</th>
+      <th width=17% align=left>Shipping Point</th>
+      <th width=15% align=left>Ship via</th>
+    </tr>
+
+    <tr>
+      <td><%quonumber%></td>
+      <td><%quodate%></td>
+      <td><%reqdate%></td>
+      <td><%employee%></td>
+      <td><%shippingpoint%></td>
+      <td><%shipvia%></td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr height="10"></tr>
+  
+  <tr>
+    <td>Please provide price and delivery time for the following items:</td>
+  </tr>
+
+  <tr height="10"></tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr>
+<!--      <th align=right>No.</th>  -->
+      <th align=left>Number</th>
+      <th align=left>Description</th>
+      <th>Qt'y</th>
+      <th>&nbsp;</th>
+      <th>Delivery</th>
+      <th>Unit Price</th>
+      <th>Extended</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+other per line item variables available <%reqdate%>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+<%if notes%>
+    <tr valign=top>
+      <td>Notes</td>
+      <td><%notes%></td>
+    </tr>
+<%end notes%>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td width=70%>&nbsp;</td>
+
+    <td width=30%>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Default/request_quotation.tex b/templates/mastertemplates/Default/request_quotation.tex
new file mode 100644
index 000000000..0f50ba17f
--- /dev/null
+++ b/templates/mastertemplates/Default/request_quotation.tex
@@ -0,0 +1,174 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage{graphicx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\vspace*{-1.3cm}
+
+\parbox{\textwidth}{
+  \parbox[b]{.42\textwidth}{
+    <%company%>
+
+    <%address%>
+  }\hfill
+  \begin{tabular}[b]{rr@{}}
+  Telephone & <%tel%>\\
+  Facsimile & <%fax%>
+  \end{tabular}
+
+  \rule[1.5ex]{\textwidth}{0.5pt}
+}
+
+
+<%pagebreak 90 27 48%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Extended} \\
+  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.45\textwidth}{
+\textbf{To}
+\vspace{0.7cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{0.3cm}
+
+<%if contact%>
+<%contact%>
+<%end contact%>
+
+\vspace{0.2cm}
+
+<%if vendorphone%>
+Tel: <%vendorphone%>
+<%end vendorphone%>
+
+<%if vendorfax%>
+Fax: <%vendorfax%>
+<%end vendorfax%>
+
+<%email%>
+}
+\parbox[t]{.45\textwidth}{
+\textbf{Ship To}
+\vspace{0.7cm}
+
+<%shiptoname%>
+
+<%shiptostreet%>
+
+<%shiptozipcode%>
+
+<%shiptocity%>
+
+<%shiptocountry%>
+
+\vspace{0.3cm}
+
+<%if shiptocontact%>
+<%shiptocontact%>
+<%end shiptocontact%>
+
+<%if shiptophone%>
+Tel: <%shiptophone%>
+<%end shiptophone%>
+
+<%if shiptofax%>
+Fax: <%shiptofax%>
+<%end shiptofax%>
+
+<%shiptoemail%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{R E Q U E S T for Q U O T A T I O N}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{RFQ \#} & \textbf{Date} & \textbf{Required by} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
+  \hline
+  <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
+
+\vspace{1cm}
+
+Please provide price and delivery time for the following items:
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rllrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} & &
+  \textbf{Delivery} & \textbf{Unit Price} & \textbf{Extended} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> & <%unit%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\hfill
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/sales_order.html b/templates/mastertemplates/Default/sales_order.html
new file mode 100644
index 000000000..343955e28
--- /dev/null
+++ b/templates/mastertemplates/Default/sales_order.html
@@ -0,0 +1,212 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telephone: <%tel%>
+      <br>Facsimile: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>S A L E S &nbsp;&nbsp; O R D E R</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>To:</th>
+      <th align=left><font color=ffffff>Ship To:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Number</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qt'y</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Price</th>
+      <th><font color=ffffff>Disc</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+    <tr>
+<%if taxincluded%>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%ordtotal%></td>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+      <th colspan=5 align=right>Subtotal</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=5><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>Terms Net <b><%terms%></b> days</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%ordtotal%></th>
+    </tr>
+<%if taxincluded%>
+    <tr>
+      <td colspan=3>Tax is included in Total</td>
+    </tr>
+<%end taxincluded%>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Notes</td>
+      <td><pre><%notes%></pre></td>
+<%end notes%>
+      <td align=right>
+      All prices in <b><%currency%></b> Funds
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    A 10% order cancellation fee will be applied for any special order
+    products or products that have been customized, enhanced or
+    upgraded at customers request.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Default/sales_order.tex b/templates/mastertemplates/Default/sales_order.tex
new file mode 100644
index 000000000..1af1b1b33
--- /dev/null
+++ b/templates/mastertemplates/Default/sales_order.tex
@@ -0,0 +1,146 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Telephone & <%tel%>\\
+    Facsimile & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
+
+\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 <%ordnumber%>}
+
+\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 <%lastpage%> & & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{S A L E S} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Order Date} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Required by} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Number} & <%ordnumber%>
+\end{tabular}
+
+\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} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%ordtotal%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>} funds.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\footnotetext[1]{\tiny
+A 10\% order cancellation fee will be applied for any special order products or
+products that have been customized, enhanced or upgraded at customers request.
+Items which are non-returnable are indicated above.
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/sales_quotation.html b/templates/mastertemplates/Default/sales_quotation.html
new file mode 100644
index 000000000..a77d0c624
--- /dev/null
+++ b/templates/mastertemplates/Default/sales_quotation.html
@@ -0,0 +1,221 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr valign=top>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+    <td align=right>
+      <h4>
+      Tel: <%tel%>
+      <br>Fax: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+<tr><td colspan=3>&nbsp;</td></tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>Q U O T A T I O N</h4>
+    </th>
+  </tr>
+
+  </table>
+
+  <table width=100% callspacing=0 cellpadding=0>
+
+  <tr>
+    <td>
+    <table width=100%>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<br>
+<%if contact%>
+<br>Attn: <%contact%>
+<%end contact%>
+
+<%if customerphone%>
+<br>Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+<br>Fax: <%customerfax%>
+<%end customerfax%>
+
+<%if email%>
+<br><%email%>
+<%end email%>
+      </td>
+
+    </tr>
+    </table>
+    </td>
+  </tr>
+  
+  <tr><td>&nbsp;</td></tr>
+  
+  <tr>
+    <td colspan=2>
+      <table width=100% border=1>
+        <tr>
+	  <th width=17% align=left nowrap>Number</th>
+	  <th width=17% align=left>Date</th>
+	  <th width=17% align=left>Valid until</th>
+	  <th width=17% align=left nowrap>Contact</th>
+	  <th width=17% align=left nowrap>Shipping Point</th>
+	  <th width=15% align=left nowrap>Ship via</th>
+	</tr>
+
+	<tr>
+	  <td><%quonumber%></td>
+	  <td><%quodate%></td>
+	  <td><%reqdate%></td>
+	  <td><%employee%></td>
+	  <td><%shippingpoint%></td>
+	  <td><%shipvia%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=right><font color=ffffff>No.</th>
+      <th align=left><font color=ffffff>Number</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qt'y</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Price</th>
+      <th><font color=ffffff>Disc</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+    <td align=right><%runningnumber%></td>
+
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=8><hr noshade></td>
+    </tr>
+    
+    <tr>
+<%if taxincluded%>
+      <th colspan=6 align=right>Total</th>
+      <td colspan=2 align=right><%invtotal%></td>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+      <th colspan=6 align=right>Subtotal</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=6 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=4>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=4>&nbsp;
+<%if terms%>
+      Terms Net <b><%terms%></b> days
+<%end terms%>
+      </td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%quototal%></th>
+    </tr>
+    
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Notes</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      All prices in <b><%currency%></b> Funds
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td width=60%><font size=-3>
+    Special order items are subject to a 10% cancellation fee.
+    </font>
+    </td>
+    <td width=40%>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
+
diff --git a/templates/mastertemplates/Default/sales_quotation.tex b/templates/mastertemplates/Default/sales_quotation.tex
new file mode 100644
index 000000000..416b0e7d7
--- /dev/null
+++ b/templates/mastertemplates/Default/sales_quotation.tex
@@ -0,0 +1,160 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage{graphicx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\vspace*{-1.3cm}
+
+\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.5ex]{\textwidth}{0.5pt}
+}
+
+
+<%pagebreak 90 27 48%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+  
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markboth{<%company%>\hfill <%quonumber%>}{<%company%>\hfill <%quonumber%>}
+
+\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 <%lastpage%> & & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.45\textwidth}{
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{0.3cm}
+
+<%if contact%>
+<%contact%>
+<%end contact%>
+
+\vspace{0.2cm}
+
+<%if customerphone%>
+Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+Fax: <%customerfax%>
+<%end customerfax%>
+
+<%email%>
+}
+
+\vspace{1cm}
+
+\textbf{Q U O T A T I O N}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{Quotation \#} & \textbf{Date} & \textbf{Valid until} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
+  \hline
+  <%quonumber%> & <%quodate%> & <%reqdate%> & <%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} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  Subtotal & <%subtotal%> \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  Total & <%quototal%>\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>}.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/Default/statement.html b/templates/mastertemplates/Default/statement.html
new file mode 100644
index 000000000..441e6e0d1
--- /dev/null
+++ b/templates/mastertemplates/Default/statement.html
@@ -0,0 +1,121 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	    <h4>
+	    <%company%>
+	    <br><%address%>
+	    </h4>
+	  </td>
+	  <th><img src=http://www.sql-ledger.org/images/sql-ledger.png border=0 width=64 height=58></th>
+	  <td align=right>
+	  <h4>
+	  Tel: <%tel%>
+	  <br>Fax: <%fax%>
+	  </h4>
+	  </td>
+	</tr>
+	<tr>
+	  <th colspan=3><h4>S T A T E M E N T</h4></th>
+	</tr>
+	<tr>
+	  <td colspan=3 align=right><%statementdate%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr valign=top>
+	  <td><%name%>
+	  <br><%street%>
+	  <br><%zipcode%>
+	  <br><%city%>
+	  <br><%country%>
+	  <br>
+<%if customerphone%>
+	  <br>Tel: <%customerphone%>
+<%end customerphone%>
+<%if customerfax%>
+	  <br>Fax: <%customerfax%>
+<%end customerfax%>
+<%if email%>
+	  <br><%email%>
+<%end email%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+        <tr>
+	  <th align=left>Invoice #</th>
+	  <th width=15%>Date</th>
+	  <th width=15%>Due</th>
+	  <th width=10%>Current</th>
+	  <th width=10%>30</th>
+	  <th width=10%>60</th>
+	  <th width=10%>90+</th>
+	</tr>
+<%foreach invnumber%>
+	<tr>
+	  <td><%invnumber%></td>
+	  <td><%invdate%></td>
+	  <td><%duedate%></td>
+	  <td align=right><%c0%></td>
+	  <td align=right><%c30%></td>
+	  <td align=right><%c60%></td>
+	  <td align=right><%c90%></td>
+	</tr>
+<%end invnumber%>
+        <tr>
+	  <td colspan=7><hr size=1></td>
+	</tr>
+	<tr>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <th align=right><%c0total%></td>
+	  <th align=right><%c30total%></td>
+	  <th align=right><%c60total%></td>
+	  <th align=right><%c90total%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td align=right>
+      <table width=50%>
+        <tr>
+	  <th>Total Outstanding</th>
+          <th align=right><%total%></th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><hr noshade></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>Please make check payable to <b><%company%></b>.
+    </td>
+  </tr>
+  <tr height=20></tr>
+</table>
+
diff --git a/templates/mastertemplates/Default/statement.tex b/templates/mastertemplates/Default/statement.tex
new file mode 100644
index 000000000..9f611b881
--- /dev/null
+++ b/templates/mastertemplates/Default/statement.tex
@@ -0,0 +1,107 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+
+      <%address%>}\hfill
+    \begin{tabular}[b]{rrr@{}}
+    Tel & <%tel%>\\
+    Fax & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
+
+\pagestyle{myheadings}
+%\thispagestyle{empty}     use this with letterhead paper
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{10.5cm}{
+  
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+}
+\parbox[t]{7.5cm}{
+<%if customerphone%>
+Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+Fax: <%customerfax%>
+<%end customerfax%>
+
+<%email%>
+}
+\hfill
+
+\vspace{1cm}
+
+\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} &
+  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
+<%foreach invnumber%>
+  <%invnumber%> & <%invdate%> & <%duedate%> &
+  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
+<%end invnumber%>
+\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
+\end{tabular*}
+\rule{\textwidth}{1pt}
+
+\vspace{0.5cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Total outstanding} & <%total%>
+\end{tabularx}
+
+\vfill
+
+Please make check payable to <%company%>
+
+\end{document}
+
diff --git a/templates/mastertemplates/French/balance_sheet.html b/templates/mastertemplates/French/balance_sheet.html
new file mode 100644
index 000000000..418f8766f
--- /dev/null
+++ b/templates/mastertemplates/French/balance_sheet.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+
+<html>
+
+<head>
+
+<title>Bilan</title>
+<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+
+</head>
+
+<body bgcolor=ffffff>
+
+<h2 align=center>
+<%company%>
+<br><%address%>
+
+<p>BILAN DE VÉRIFICATION
+<br><%period%>
+</h2>
+
+<table border=0>
+<tr>
+  <th align=left width=400 colspan=2>ACTIF<br><hr align=left width=250 size=5 noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach asset_account%>
+<tr>
+  <td> </td>
+  <td><%asset_account%></td>
+  <td align=right><%asset_this_period%></td>
+  <td align=right><%asset_last_period%></td>
+</tr>
+<%end asset_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>Total Actif</th>
+  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
+  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
+</tr>
+
+<tr>
+  <th align=left colspan=4>PASSIF<b><hr align=left width=250 size=5 noshade></th>
+</tr>
+
+<%foreach liability_account%>
+<tr>
+  <td></td>
+  <td><%liability_account%></td>
+  <td align=right><%liability_this_period%></td>
+  <td align=right><%liability_last_period%></td>
+</tr>
+<%end liability_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td></td>
+  <th align=left>Total Passif</th>
+  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr>
+  <th align=left colspan=4>BENEFICES NON DISTRIBUÉS<br><hr align=left width=250 size=5 noshade></th>
+</tr>
+
+<%foreach equity_account%>
+<tr>
+  <td></td>
+  <td><%equity_account%></td>
+  <td align=right><%equity_this_period%></td>
+  <td align=right><%equity_last_period%></td>
+</tr>
+<%end equity_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td></td>
+  <th align=left>Total Capital</th>
+  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>TOTAL PASSIF & CAPITAL</th>
+  <td align=right><%total_this_period%><br><hr noshade size=2></td>
+  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+</tr>
+</table>
+</body>
+</html>
diff --git a/templates/mastertemplates/French/check.tex b/templates/mastertemplates/French/check.tex
new file mode 100644
index 000000000..4f97660be
--- /dev/null
+++ b/templates/mastertemplates/French/check.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Invoice No.} & \textbf{Invoice Date}
+  & \textbf{Due} & \textbf{Applied} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/French/income_statement.html b/templates/mastertemplates/French/income_statement.html
new file mode 100644
index 000000000..1d20875da
--- /dev/null
+++ b/templates/mastertemplates/French/income_statement.html
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+
+<html>
+
+<head>
+
+<title>Compte de Résultat</title>
+<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+
+</head>
+
+<body bgcolor=ffffff>
+
+<h2 align=center>
+<%company%>
+<br><%address%>
+
+<p>Compte de Résultat
+<br><%period%>
+</h2>
+
+
+<table width=100% border=0>
+<tr>
+  <th width=400 align=left colspan=2>RECETTES<br><hr width=300 size=5 align=left noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach income_account%>
+<tr>
+  <td width=4> </td>
+  <td><%income_account%></td>
+  <td align=right><%income_this_period%></td>
+  <td align=right><%income_last_period%></td>
+</tr>
+<%end income_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td> </td>
+  <th align=left>Total Recettes</th>
+  <td align=right><%total_income_this_period%><hr noshade size=2></td>
+  <td align=right><%total_income_last_period%><hr noshade size=2></td>
+</tr>
+
+<tr>
+  <th align=left colspan=2>DÉPENSES<br><hr width=300 size=5 align=left noshade></th>
+</tr>
+
+<%foreach expense_account%>
+<tr>
+  <td> </td>
+  <td><%expense_account%></td>
+  <td align=right><%expenses_this_period%></td>
+  <td align=right><%expenses_last_period%></td>
+</tr>
+<%end expense_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td> </td>
+  <th align=left>Total Dépenses</th>
+  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>BENEFICES / PERTES (en <%currency%> )</th>
+  <td align=right><%total_this_period%><br><hr noshade size=2></td>
+  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+</tr>
+
+</table>
+</body>
+</html>
diff --git a/templates/mastertemplates/French/invoice.html b/templates/mastertemplates/French/invoice.html
new file mode 100644
index 000000000..6124e93ae
--- /dev/null
+++ b/templates/mastertemplates/French/invoice.html
@@ -0,0 +1,309 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+
+<html>
+
+<head>
+
+<title>A2A <%invnumber%> <%name%></title>
+<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+
+</head>
+
+<body bgcolor="ffffff">
+
+<table width="100%">
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width="100%">
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Tél&nbsp;: <%tel%>
+      <br>Fax&nbsp;: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>F A C T U R E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width="100%" cellspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Date de facture</th><td width=10>&nbsp;</td><td><%invdate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Date d'échéance</th><td width=10>&nbsp;</td><td><%duedate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>N° de facture</th><td>&nbsp;</td><td><%invnumber%></td></tr>
+    </tr>
+  
+<!--
+    <tr>
+      <th align=right>Correspondant</th><td>&amp;nbsp;</td><td><%employee%></td>
+    </tr>
+-->
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width="100%">
+    <tr bgcolor="000000">
+      <th align=left><font color=ffffff>Adresse de facturation</font></th>
+      <th align=left><font color=ffffff>Adresse d'envoi</font></th>
+    </tr>
+
+<!--
+     d'autres variables pouvant être utilisées ici :
+     contact, shiptocontact, shiptophone, shiptofax
+-->
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+      
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width="100%">
+    <tr bgcolor="000000">
+<!--      <th align=right><font color="ffffff">N°</font></th>  -->
+      <th align=left><font color="ffffff">N°</font></th>
+      <th align=left><font color="ffffff">Description</font></th>
+      <th><font color="ffffff">Qté</font></th>
+      <th>&nbsp;</th>
+      <th><font color="ffffff">Prix</font></th>
+      <th><font color="ffffff">Remise</font></th>
+      <th><font color="ffffff">Montant</font></th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+veuillez adapter le colspan si vous comptez inclure ce poste.
+ceci permettra de décaler le poste sous-total vers la gauche.
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+<!--
+vous pouvez également utiliser netprice à la place de sellprice
+si vous ne voulez pas afficher la remise
+netprice = sellprice - discount
+-->
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+    <tr>
+<%if taxincluded%>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%invtotal%></td>
+<%end taxincluded%>
+<%if not taxincluded%>
+      <th colspan=5 align=right>Sous-total</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%></th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+<%if paid%>
+    <tr>
+      <th colspan=5 align=right>Déjà payé</th>
+      <td colspan=2 align=right>- <%paid%></td>
+    </tr>
+<%end paid%>
+
+    <tr>
+      <td colspan=3>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>À régler dans <b><%terms%></b> jours au plus tard.</td>
+      <th colspan=2 align=right>Solde à régler</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width="100%">
+    <tr valign=top>
+<%if notes%>
+      <td>À noter&nbsp;:</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Tous prix indiqués en <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<%if paid%>
+<tr>
+  <td colspan=7>
+    <table width="60%">
+      <tr>
+        <th align=left>Détail règlements</th>
+      </tr>
+      <tr>
+        <td colspan=4>
+	  <hr noshade>
+	</td>
+      </tr>
+      <tr>
+        <th align=left>Date</th>
+	<th align=left>Compte</th>
+	<th align=left>Source</th>
+	<th align=left>Montant</th>
+      </tr>
+<%end paid%>
+
+<%foreach payment%>
+      <tr>
+        <td><%paymentdate%></td>
+	<td><%paymentaccount%></td>
+	<td><%paymentsource%></td>
+	<td><%payment%></td>
+      </tr>
+<%end payment%>
+
+<%if paid%>
+    </table>
+  </td>
+</tr>
+
+<tr>
+  <td>&nbsp;</td>
+</tr>
+<%end paid%>
+
+<tr>
+  <th colspan=7>
+  <!-- <br>Merci beaucoup&amp;nbsp;! -->
+  </th>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+  <td>
+  <table width="100%">
+  <tr valign=top>
+    <td><font size=-3>
+    &nbsp;
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+<!-- <%foreach tax%>
+  <tr>
+   <th colspan=7 align=left><font size=-2><%taxdescription%> Numéro de TVA <%taxnumber%></font></th>
+  </tr>
+<%end tax%> -->
+
+<%if taxincluded%>
+  <tr>
+    <th colspan=7 align=left><font size=-2>Les taxes affichés sont inclus dans le prix.</font></th>
+  </tr>
+<%end taxincluded%>
+
+<!-- business number
+  <tr>
+    <th colspan=7 align=left><font size=-2>Régistre de Commerce&amp;nbsp;: <%businessnumber%></font></th>
+  </tr>
+-->
+
+<!-- information banquaire -->
+  <tr><td>
+  <h6><center>N° TVA&nbsp;: &nbsp;&nbsp;Banque&nbsp;: &nbsp;&nbsp;N° de compte&nbsp;: &nbsp;&nbsp;Code SWIFT&nbsp;: </center>
+  </h6>
+    </td>
+  </tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/templates/mastertemplates/French/invoice.tex b/templates/mastertemplates/French/invoice.tex
new file mode 100644
index 000000000..6d546f129
--- /dev/null
+++ b/templates/mastertemplates/French/invoice.tex
@@ -0,0 +1,151 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage[frenchb]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{tabularx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Téléphone & <%tel%>\\
+    Télécopieur & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
+
+\pagestyle{myheadings}
+%\thispagestyle{empty}     use this with letterhead paper
+
+<%pagebreak 90 27 48%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+  
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markright{<%company%>\hfill <%invnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
+  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
+    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
+  & reporté de la page <%lastpage%> & & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{F A C T U R E}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date de facturation} & <%invdate%> \\
+  \textbf{Numéro de facture} & <%invnumber%> \\
+  \textbf{Numéro de client} & <%customer_id%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
+  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
+    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Sous-total} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> de <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%total%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  Tous les prix indiqués sont en \textbf{<%currency%>}.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+\vfill
+\centerline{\textbf{Merci de faire affaire avec nous!}}
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\footnotetext[1]{\tiny
+Le paiement doit être acquitté au plus tard <%terms%> jours à partir de
+la date de facturation. Des intérêts seront perçus à raison de 1.5\% par
+mois après <%duedate%> jusqu'à ce que le paiement soit complet. Les
+éléments retournés seront sujets à un supplément de remmagasinnage de
+10\%. Une autorisation de renvoi doit être obtenue au préalable auprès de
+<%company%>. Les frais de transports et d'assurance sur les éléments
+retournés devront être couvert par le client de façon appropriée.
+<%company%> ne peut être tenue responsable des dommages survenus pendant
+le transit.}
+
+\end{document}
diff --git a/templates/mastertemplates/French/purchase_order.html b/templates/mastertemplates/French/purchase_order.html
new file mode 100644
index 000000000..52628e082
--- /dev/null
+++ b/templates/mastertemplates/French/purchase_order.html
@@ -0,0 +1,207 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+
+<html>
+
+<head>
+
+<title>Commande <%ordnumber%> <%name%></title>
+<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+
+</head>
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Tél&nbsp;: <%tel%>
+      <br>Fax&nbsp;: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>B O N&nbsp;&nbsp;D E&nbsp;&nbsp;C O M M A N D E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+ <table width=100% cellspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Date commande</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Requis pour</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>N° commande</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>Commandé par</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>N°</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qté</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Prix</th>
+      <th><font color=ffffff>Montant</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+veuillez ajuster le colspan si vous voulez inclure ce poste pour décaler le sous-total vers la droite.
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=6><hr noshade></td>
+    </tr>
+    
+    <tr>
+      <th colspan=4 align=right>Sous-total</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=2>À régler dans <b><%terms%></b> jours au plus tard</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>À noter&nbsp;:</td>
+      <td><pre><%notes%></pre></td>
+<%end notes%>
+      <td align=right>
+      Tous prix indiqués en <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td>
+<!--
+<font size=-3>
+    Payment due NET <%terms%> Days from date of Invoice.
+    Interest on overdue amounts will acrue at the rate of 1.5% per month
+    from due date 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.
+    </font>
+-->
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/French/purchase_order.tex b/templates/mastertemplates/French/purchase_order.tex
new file mode 100644
index 000000000..fabb79fdb
--- /dev/null
+++ b/templates/mastertemplates/French/purchase_order.tex
@@ -0,0 +1,143 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage[frenchb]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{tabularx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Téléphone & <%tel%>\\
+    Télécopieur & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
+
+\pagestyle{myheadings}
+%\thispagestyle{empty}     use this with letterhead paper
+
+<%pagebreak 90 27 48%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+  
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markright{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+  & reporté de la page <%lastpage%> & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{B O N} \parbox{0.3cm}{\hfill} \textbf{D E} \parbox{0.3cm}{\hfill}
+\textbf{C O M M A N D E}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date de la commande} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Livrable le} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Numéro de commande} & <%ordnumber%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
+    \textbf{Unité} & \textbf{Prix} & \textbf{Montant} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Sous-total} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> de <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%ordtotal%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  Tous les prix indiqués sont en \textbf{<%currency%>}.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+
+%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+%\footnotetext[1]{\tiny }
+
+\end{document}
diff --git a/templates/mastertemplates/French/receipt.tex b/templates/mastertemplates/French/receipt.tex
new file mode 100644
index 000000000..4f97660be
--- /dev/null
+++ b/templates/mastertemplates/French/receipt.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Invoice No.} & \textbf{Invoice Date}
+  & \textbf{Due} & \textbf{Applied} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/French/sales_order.html b/templates/mastertemplates/French/sales_order.html
new file mode 100644
index 000000000..35351e12d
--- /dev/null
+++ b/templates/mastertemplates/French/sales_order.html
@@ -0,0 +1,229 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+
+<html>
+
+<head>
+
+<title>Commande <%ordnumber%> <%name%></title>
+<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+
+</head>
+
+<body bgcolor="ffffff">
+
+<table width="100%">
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width="100%">
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Tél&nbsp;: <%tel%>
+      <br>Fax&nbsp;: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>B O N&nbsp;&nbsp;&nbsp;D E&nbsp;&nbsp;&nbsp;C O M M A N D E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% cellspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Date commande</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Requis pour</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>N° commande</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width="100%">
+    <tr bgcolor="000000">
+      <th align=left><font color="ffffff">Commandé par</th>
+      <th align=left><font color="ffffff">Adresse d'envoi</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width="100%">
+    <tr bgcolor="000000">
+<!--      <th align=right><font color="ffffff">N°</th>  -->
+      <th align=left><font color="ffffff">N°</th>
+      <th align=left><font color="ffffff">Description</th>
+      <th><font color="ffffff">Qté</th>
+      <th>&nbsp;</th>
+      <th><font color="ffffff">Prix</th>
+      <th><font color="ffffff">Remise</th>
+      <th><font color="ffffff">Montant</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+    <tr>
+<%if taxincluded%>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%ordtotal%></td>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+      <th colspan=5 align=right>Sous-total</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%></th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=5><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>À régler dans <b><%terms%></b> jours au plus tard</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%ordtotal%></th>
+    </tr>
+<%if taxincluded%>
+    <tr>
+      <td colspan=3>Taxe comprise dans Total</td>
+    </tr>
+<%end taxincluded%>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width="100%">
+    <tr valign=top>
+<%if notes%>
+      <td>À noter&nbsp;:</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Tous prix indiqués en <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width="100%">
+  <tr valign=top>
+    <td><font size=-3>
+<!--
+    A 10% order cancellation fee will be applied for any special order
+    products or products that have been customized, enhanced or
+    upgraded at customers request.
+-->
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  <tr>
+  <td colspan=5>
+    <h6><center>N° TVA&nbsp;: &nbsp;&nbsp;Banque&nbsp;: &nbsp;&nbsp;N° de compte&nbsp;: &nbsp;&nbsp;Code SWIFT&nbsp;: </center>
+      </h6>
+  </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/templates/mastertemplates/French/sales_order.tex b/templates/mastertemplates/French/sales_order.tex
new file mode 100644
index 000000000..50e4a052e
--- /dev/null
+++ b/templates/mastertemplates/French/sales_order.tex
@@ -0,0 +1,147 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage[frenchb]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{tabularx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Téléphone & <%tel%>\\
+    Télécopieur & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
+
+\pagestyle{myheadings}
+%\thispagestyle{empty}     use this with letterhead paper
+
+<%pagebreak 90 27 48%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+  
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markright{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
+  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
+    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
+  & reporté de la page <%lastpage%> & & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{C O M M A N D E} \parbox{0.3cm}{\hfill} \textbf{C L I E N T}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date de la commande} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Livrable le} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Numéro de commande} & <%ordnumber%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
+  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
+    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Sous-total} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> de <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%ordtotal%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  Tous les prix indiqués sont en \textbf{<%currency%>}.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\footnotetext[1]{\tiny
+Un supplément de 10% sera appliqué à toute commande spécifique et à tout
+produit adapté, amélioré ou mis-à-jour à la demande du client. Les
+éléments non-retournables sont indiqués ci-dessus.
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/French/statement.html b/templates/mastertemplates/French/statement.html
new file mode 100644
index 000000000..9ece5ede0
--- /dev/null
+++ b/templates/mastertemplates/French/statement.html
@@ -0,0 +1,133 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
+
+<html>
+
+<head>
+
+<title>Extrait de compte pour <%name%></title>
+<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+
+</head>
+
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	    <h4>
+	    <%company%>
+	    <br><%address%>
+	    </h4>
+	  </td>
+	  <th></th>
+	  <td align=right>
+	  <h4>
+	  Tél&nbsp;: <%tel%>
+	  <br>Fax&nbsp;: <%fax%>
+	  </h4>
+	  </td>
+	</tr>
+	<tr>
+	  <th colspan=3><h4>E X T R A I T&nbsp;&nbsp;D E&nbsp;&nbsp;C O M P T E</h4></th>
+	</tr>
+	<tr>
+	  <td colspan=3 align=right><%statementdate%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr valign=top>
+	  <td><%name%>
+	  <br><%street%>
+	  <br><%zipcode%>
+	  <br><%city%>
+	  <br><%country%>
+	  <br>
+<%if customerphone%>
+	  <br>Tél&nbsp;: <%customerphone%>
+<%end customerphone%>
+<%if customerfax%>
+	  <br>Fax&nbsp;: <%customerfax%>
+<%end customerfax%>
+<%if email%>
+	  <br><%email%>
+<%end email%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+        <tr>
+	  <th align=left>Facture n°</th>
+	  <th width=15%>Date</th>
+	  <th width=15%>Echeance</th>
+	  <th width=10%>Actuel</th>
+	  <th width=10%>30</th>
+	  <th width=10%>60</th>
+	  <th width=10%>90+</th>
+	</tr>
+<%foreach invnumber%>
+	<tr>
+	  <td><%invnumber%></td>
+	  <td><%invdate%></td>
+	  <td><%duedate%></td>
+	  <td align=right><%c0%></td>
+	  <td align=right><%c30%></td>
+	  <td align=right><%c60%></td>
+	  <td align=right><%c90%></td>
+	</tr>
+<%end invnumber%>
+        <tr>
+	  <td colspan=7><hr size=1></td>
+	</tr>
+	<tr>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <th align=right><%c0total%></td>
+	  <th align=right><%c30total%></td>
+	  <th align=right><%c60total%></td>
+	  <th align=right><%c90total%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td align=right>
+      <table width=50%>
+        <tr>
+	  <th>Solde impayé</th>
+          <th align=right><%total%></th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><hr noshade></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>Tout paiement au nom de <b><%company%></b>
+    </td>
+  </tr>
+  <tr height=20></tr>
+</table>
+</body>
+</html>
diff --git a/templates/mastertemplates/French/statement.tex b/templates/mastertemplates/French/statement.tex
new file mode 100644
index 000000000..23ebf781e
--- /dev/null
+++ b/templates/mastertemplates/French/statement.tex
@@ -0,0 +1,137 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+
+      <%address%>}\hfill
+    \begin{tabular}[b]{rrr@{}}
+    Tel & <%tel%>\\
+    Fax & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
+
+\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}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{10.5cm}{
+  
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+}
+\parbox[t]{7.5cm}{
+<%if customerphone%>
+Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+Fax: <%customerfax%>
+<%end customerfax%>
+
+<%email%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{S T A T E M E N T} \hfill
+
+\hfill <%statementdate%>
+
+\vspace{2cm}
+
+\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
+  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
+  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
+<%foreach invnumber%>
+  <%invnumber%> & <%invdate%> & <%duedate%> &
+  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
+<%end invnumber%>
+\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
+\end{tabular*}
+\rule{\textwidth}{1pt}
+
+\vspace{1cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Total outstanding} & <%total%>
+\end{tabularx}
+
+\vfill
+
+Please make check payable to <%company%>
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\footnotetext[1]{\tiny
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/balance_sheet.html b/templates/mastertemplates/German/balance_sheet.html
new file mode 100644
index 000000000..985b6eff5
--- /dev/null
+++ b/templates/mastertemplates/German/balance_sheet.html
@@ -0,0 +1,100 @@
+
+<body bgcolor="#ffffff">
+
+<h2 align="center">
+<%company%>
+<br><%address%>
+
+<p>BILANZ
+<br><%period%>
+</h2>
+
+<table border="0">
+<tr>
+  <th align="left" width="400" colspan="2">AKTIVA<br><hr align="left" width="250" size="5" noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach asset_account%>
+<tr>
+  <td> </td>
+  <td><%asset_account%></td>
+  <td align="right"><%asset_this_period%></td>
+  <td align="right"><%asset_last_period%></td>
+</tr>
+<%end asset_account%>
+
+<tr>
+  <td colspan="2"> </td>
+  <td><hr noshade size="1"></td>
+  <td><hr noshade size="1"></td>
+</tr>
+
+<tr valign="top">
+  <th align="left" colspan="2">TOTAL</th>
+  <td align="right"><%total_assets_this_period%><hr noshade size="2"></td>
+  <td align="right"><%total_assets_last_period%><hr noshade size="2"></td>
+</tr>
+
+<tr>
+  <th align="left" colspan="4">PASSIVA<b><hr align="left" width="250" size="5" noshade></th>
+</tr>
+
+<%foreach liability_account%>
+<tr>
+  <td></td>
+  <td><%liability_account%></td>
+  <td align="right"><%liability_this_period%></td>
+  <td align="right"><%liability_last_period%></td>
+</tr>
+<%end liability_account%>
+
+<tr>
+  <td colspan="2"> </td>
+  <td><hr noshade size="1"></td>
+  <td><hr noshade size="1"></td>
+</tr>
+
+<tr valign="top">
+  <td></td>
+  <th align="left">TOTAL</th>
+  <td align="right"><%total_liabilities_this_period%><br><hr noshade size="2"</td>
+  <td align="right"><%total_liabilities_last_period%><br><hr noshade size="2"</td>
+</tr>
+
+<tr>
+  <th align="left" colspan="4">EIGENTUM<br><hr align="left" width="250" size="5" noshade></th>
+</tr>
+
+<%foreach equity_account%>
+<tr>
+  <td></td>
+  <td><%equity_account%></td>
+  <td align="right"><%equity_this_period%></td>
+  <td align="right"><%equity_last_period%></td>
+</tr>
+<%end equity_account%>
+
+<tr>
+  <td colspan="2"> </td>
+  <td><hr noshade size="1"></td>
+  <td><hr noshade size="1"></td>
+</tr>
+
+<tr valign="top">
+  <td></td>
+  <th align="left">TOTAL</th>
+  <td align="right"><%total_equity_this_period%><br><hr noshade size="2"</td>
+  <td align="right"><%total_equity_last_period%><br><hr noshade size="2"</td>
+</tr>
+
+<tr valign="top">
+  <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
+  <td align="right"><%total_this_period%><br><hr noshade size="2"></td>
+  <td align="right"><%total_last_period%><br><hr noshade size="2"></td>
+</tr>
+</table>
+
+
+
diff --git a/templates/mastertemplates/German/bin_list.html b/templates/mastertemplates/German/bin_list.html
new file mode 100644
index 000000000..d57632dc7
--- /dev/null
+++ b/templates/mastertemplates/German/bin_list.html
@@ -0,0 +1,180 @@
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	    <h4>
+	    <%company%>
+	    <br><%address%>
+	    </h4>
+	  </td>
+	  
+	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+	  <th align=right>
+	    <h4>
+	    Tel: <%tel%>
+	    <br>Fax: <%fax%>
+	    </h4>
+	  </td>
+	</tr>
+	
+	<tr>
+	  <th colspan=3>
+	    <h4>L A G E R L I S T E</h4>
+	  </th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% cellspacing=0 cellpadding=0>
+	<tr bgcolor=000000>
+	  <th align=left width=50%><font color=ffffff>Absender</th>
+	  <th align=left width=50%><font color=ffffff>Lieferanschrift</th>
+	</tr>
+
+	<tr valign=top>
+	  <td><%name%>
+	  <br><%street%>
+	  <br><%zipcode%>
+	  <br><%city%>
+	  <br><%country%>
+	  <br>
+
+	  <%if contact%>
+	  <br>Kontakt: <%contact%>
+	  <%end contact%>
+
+	  <%if vendorphone%>
+	  <br>Tel: <%vendorphone%>
+	  <%end vendorphone%>
+
+	  <%if vendorfax%>
+	  <br>Fax: <%vendorfax%>
+	  <%end vendorfax%>
+
+	  <%if email%>
+	  <br><%email%>
+	  <%end email%>
+	  
+	  </td>
+	  
+	  <td><%shiptoname%>
+	  <br><%shiptostreet%>
+	  <br><%shiptozipcode%>
+	  <br><%shiptocity%>
+	  <br><%shiptocountry%>
+
+	  <br>
+	  <%if shiptocontact%>
+	  <br>Kontakt: <%shiptocontact%>
+	  <%end shiptocontact%>
+	  
+	  <%if shiptophone%>
+	  <br>Tel: <%shiptophone%>
+	  <%end shiptophone%>
+
+	  <%if shiptofax%>
+	  <br>Fax: <%shiptofax%>
+	  <%end shiptofax%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr height=5></tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% border=1>
+	<tr>
+	  <th width=17% align=left nowrap>BestellNr. #</th>
+	  <th width=17% align=left nowrap>Datum</th>
+	  <th width=17% align=left nowrap>Kontakt</th>
+	  <%if warehouse%>
+	  <th width=17% align=left nowrap>Lager</th>
+	  <%end warehouse%>
+	  <th width=17% align=left>Versandort</th>
+	  <th width=15% align=left>Lieferung durch</th>
+	</tr>
+
+	<tr>
+	  <td><%ordnumber%>&nbsp;</td>
+
+	  <%if shippingdate%>
+	  <td><%shippingdate%></td>
+	  <%end shippingdate%>
+
+	  <%if not shippingdate%>
+	  <td><%orddate%></td>
+	  <%end shippingdate%>
+
+	  <td><%employee%>&nbsp;</td>
+
+	  <%if warehouse%>
+	  <td><%warehouse%></td>
+	  <%end warehouse%>
+
+	  <td><%shippingpoint%>&nbsp;</td>
+	  <td><%shipvia%>&nbsp;</td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100%>
+	<tr bgcolor=000000>
+	  <th align=left><font color=ffffff>Pos</th>
+	  <th align=left><font color=ffffff>ArtNr.</th>
+	  <th align=left><font color=ffffff>Beschreibung</th>
+	  <th><font color=ffffff>Seriennummer</th>
+	  <th>&nbsp;</th>
+	  <th><font color=ffffff>Menge</th>
+	  <th><font color=ffffff>Erh</th>
+	  <th>&nbsp;</th>
+	  <th><font color=ffffff>Lagerplatz</th>
+	</tr>
+
+	<%foreach number%>
+	<tr valign=top>
+	  <td><%runningnumber%></td>
+	  <td><%number%></td>
+	  <td><%description%></td>
+	  <td><%serialnumber%></td>
+	  <td><%deliverydate%></td>
+	  <td align=right><%qty%></td>
+	  <td align=right><%ship%></td>
+	  <td><%unit%></td>
+	  <td><%bin%></td>
+	</tr>
+	<%end number%>
+
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td><hr noshade></td>
+  </tr>
+
+</table>
+
diff --git a/templates/mastertemplates/German/bin_list.tex b/templates/mastertemplates/German/bin_list.tex
new file mode 100644
index 000000000..91e3b9c97
--- /dev/null
+++ b/templates/mastertemplates/German/bin_list.tex
@@ -0,0 +1,128 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\usepackage{graphicx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{17cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+
+\begin{document}
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{-1.3cm}
+
+\parbox{\textwidth}{
+  \parbox[b]{.42\textwidth}{%
+    <%company%>
+    
+    <%address%>
+  }\hfill
+  \begin{tabular}[b]{rr@{}}
+  Tel & <%tel%>\\
+  Fax & <%fax%>
+  \end{tabular}
+
+  \rule[1.5ex]{\textwidth}{0.5pt}
+}
+
+ 
+<%pagebreak 90 27 37%>
+\end{tabularx}
+
+\newpage
+
+\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
+  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennummer} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.5\textwidth}{
+\textbf{Von}
+\vspace{0.7cm}
+
+<%name%> \\
+<%street%> \\
+<%zipcode%> \\
+<%city%> \\
+<%country%>
+}
+\parbox[t]{.4\textwidth}{
+\textbf{Lieferanschrift}
+\vspace{0.7cm}
+
+<%shiptoname%> \\
+<%shiptostreet%> \\
+<%shiptozipcode%> \\
+<%shiptocity%> \\
+<%shiptocountry%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{L A G E R L I S T E}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
+  <%if warehouse%>
+  & \textbf{Lager}
+  <%end warehouse%>
+  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
+  \hline
+
+  <%ordnumber%>
+  <%if shippingdate%>
+  & <%shippingdate%>
+  <%end shippingdate%>
+  <%if not shippingdate%>
+  & <%orddate%>
+  <%end shippingdate%>
+  & <%employee%>
+  <%if warehouse%>
+  & <%warehouse%>
+  <%end warehouse%>
+  & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
+  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennumner} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
+
+<%foreach number%>
+  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
+  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
+<%end number%>
+\end{tabularx}
+
+
+\rule{\textwidth}{2pt}
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/bwa.html b/templates/mastertemplates/German/bwa.html
new file mode 100644
index 000000000..91907d8fe
--- /dev/null
+++ b/templates/mastertemplates/German/bwa.html
@@ -0,0 +1,582 @@
+<body>
+<style type="text/css">
+<!--
+/* Allgemeine Schriftdefinition */
+th,td {
+	font-family: Arial, Verdana, Helvetica, Sans-serif;
+	font-size:small;
+}
+
+@page {
+	size: landscape;
+	margin: 0.5cm;
+}
+
+/* Definition Tabellenueberschrift */
+
+.left	{ text-align:left; }
+.center	{ text-align:center; }
+.right	{ text-align:right; }
+
+tr.headline    { border:0; }
+tr.headline td { border:0; }
+h1 { font-size:120%; }
+h2 { font-size:100%; }
+
+/* Tabellenkopf */
+th {
+	font-weight: bold;
+	border-bottom: solid thin black;
+	padding:0 10px;
+	text-align:right;
+}
+
+th.left  { border-left:  solid thin black; }
+th.right { border-right: solid thin black; }
+
+.querkopf th.right { text-align:center; }
+.querkopf th {
+	border-top: solid thin black;
+	border-bottom:0;
+}
+
+/* Tabelleninhalt */
+td {
+	text-align:right;
+	padding:0 0.5em;
+}
+td.left  { border-left:  solid thin black; }
+td.right { border-right: solid thin black; }
+
+
+/* jede zweite Zeile grau hinterlegen */
+tr.grey {
+	background:#f0f0f0;
+}
+
+/* letzte Zeile in der Tabelle */
+#last td{ border-bottom: solid thin black; }
+
+/* Zwischensumme/-ueberschriften */
+tr.subtotal td { font-weight: bold; }
+
+/* Fusszeile unter der Tabelle */
+td.footer {
+	text-align:right;
+	font-size:smaller;
+}
+//-->
+</style>
+
+<table border=0 cellpadding=0 cellspacing=0>
+<tr class="headline">
+	<td class="left"><%company%></td>
+	<td class=center colspan="9">
+		<h1>Kurzfristige Erfolgsrechnung <%period%></h1>
+		<h2>SKR3 &nbsp; BWA</h2>
+	</td>
+	<td class="right">Blatt 1</td>
+</tr>
+	
+	
+</tr>	
+<tr class="querkopf">
+	<th class="left">&nbsp;</th>
+	<th class="center" colspan="5">Im Betrachtungszeitraum</th>
+	<th class="right" colspan="5">Kumuliert seit Jahresanfang</th>
+</tr>
+
+<tr>
+	<th class="left">Bezeichnung</th>
+	<th>Wert</th>
+	<th>% Ges.- Leistg.</th>
+	<th>% Ges.- Kosten</th>
+	<th>% Pers.- Kosten</th>
+	<th>Aufschlag</th>
+	<th>Wert</th>
+	<th>% Ges.- Leistg.</th>
+	<th>% Ges.- Kosten</th>
+	<th>% Pers.- Kosten</th>
+	<th class="right">Aufschlag</th>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Umsatzerl&ouml;se</nobr></td>
+	<td><nobr><%jetzt1%></nobr></td>
+	<td><nobr><%jetztgl1%></nobr></td>
+	<td></td>
+	<td></td>
+	<td></td>
+	<td><nobr><%kumm1%></nobr></td>
+	<td><nobr><%kummgl1%></nobr></td>
+	<td></td>
+	<td></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>Best.Verdg. FE/UE</nobr></td>
+	<td><nobr><%jetzt2%></nobr></td>
+	<td><nobr><%jetztgl2%></nobr></td>
+	<td></td>
+	<td></td>
+	<td></td>	
+	<td><nobr><%kumm2%></nobr></td>
+	<td><nobr><%kummgl2%></nobr></td>
+	<td></td>
+	<td></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Akt.Eigenleistungen</nobr></td>
+	<td><nobr><%jetzt3%></nobr></td>
+	<td><nobr><%jetztgl3%></nobr></td>
+	<td></td>
+	<td></td>
+	<td></td>
+	<td><nobr><%kumm3%></nobr></td>
+	<td><nobr><%kummgl3%></nobr></td>
+	<td></td>
+	<td></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+	
+<tr class="grey subtotal">
+	<td class="left"><nobr>Gesamtleistung</nobr></td>
+	<td><nobr><%jetztgesamtleistung%></nobr></td>
+	<td><nobr><%jetztglgesamtleistung%></nobr></td>
+	<td><nobr><%jetztgkgesamtleistung%></nobr></td>
+	<td><nobr><%jetztpkgesamtleistung%></nobr></td>
+	<td></td>
+	<td><nobr><%kummgesamtleistung%></nobr></td>
+	<td><nobr><%kummglgesamtleistung%></nobr></td>
+	<td><nobr><%kummgkgesamtleistung%></nobr></td>
+	<td><nobr><%kummpkgesamtleistung%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+	
+<tr class="grey">
+	<td class="left"><nobr>Mat./Wareneinkauf</nobr></td>
+	<td><nobr><%jetzt4%></nobr></td>
+	<td><nobr><%jetztgl4%></nobr></td>
+	<td><nobr><%jetztgk4%></nobr></td>
+	<td><nobr><%jetztpk4%></nobr></td>
+	<td><nobr><%jetztauf4%></nobr></td>
+	<td><nobr><%kumm4%></nobr></td>
+	<td><nobr><%kummgl4%></nobr></td>
+	<td><nobr><%kummgk4%></nobr></td>
+	<td><nobr><%kummpk4%></nobr></td>
+	<td class="right"><nobr><%kummauf4%></nobr>&nbsp;</td>
+</tr>
+	
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+		
+<tr class="grey subtotal">
+	<td class="left"><nobr>Rohertrag</nobr></td>
+	<td><nobr><%jetztrohertrag%></nobr></td>
+	<td><nobr><%jetztglrohertrag%></nobr></td>
+	<td><nobr><%jetztgkrohertrag%></nobr></td>
+	<td><nobr><%jetztpkrohertrag%></nobr></td>
+	<td><nobr><%jetztaufrohertrag%></nobr></td>
+	<td><nobr><%kummrohertrag%></nobr></td>
+	<td><nobr><%kummglrohertrag%></nobr></td>
+	<td><nobr><%kummgkrohertrag%></nobr></td>
+	<td><nobr><%kummpkrohertrag%></nobr></td>
+	<td class="right"><nobr><%kummaufrohertrag%></nobr>&nbsp;</td>
+</tr>
+	
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+		
+<tr class="grey">
+	<td class="left"><nobr>So.betr.Erl&ouml;se</nobr></td>
+	<td><nobr><%jetzt5%></nobr></td>
+	<td><nobr><%jetztgl5%></nobr></td>
+	<td><nobr><%jetztgk5%></nobr></td>
+	<td><nobr><%jetztpk5%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm5%></nobr></td>
+	<td><nobr><%kummgl5%></nobr></td>
+	<td><nobr><%kummgk5%></nobr></td>
+	<td><nobr><%kummpk5%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+		
+<tr class="grey subtotal">
+	<td class="left"><nobr>Betriebl. Rohertrag</nobr></td>
+	<td><nobr><%jetztbetriebrohertrag%></nobr></td>
+	<td><nobr><%jetztglbetriebrohertrag%></nobr></td>
+	<td><nobr><%jetztgkbetriebrohertrag%></nobr></td>
+	<td><nobr><%jetztpkbetriebrohertrag%></nobr></td>
+	<td><nobr><%jetztaufbetriebrohertrag%></nobr></td>
+	<td><nobr><%kummbetriebrohertrag%></nobr></td>
+	<td><nobr><%kummglbetriebrohertrag%></nobr></td>
+	<td><nobr><%kummgkbetriebrohertrag%></nobr></td>
+	<td><nobr><%kummpkbetriebrohertrag%></nobr></td>
+	<td
+class="right"><nobr><%kummaufbetriebrohertrag%></nobr>&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+	<td class="left">Kostenarten:</td>
+	<td class="right" colspan="10">&nbsp;</td>
+</tr>	
+		
+<tr class="white">
+	<td class="left"><nobr>Personalkosten</nobr></td>
+	<td><nobr><%jetzt10%></nobr></td>
+	<td><nobr><%jetztgl10%></nobr></td>
+	<td><nobr><%jetztgk10%></nobr></td>
+	<td><nobr><%jetztpk10%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm10%></nobr></td>
+	<td><nobr><%kummgl10%></nobr></td>
+	<td><nobr><%kummgk10%></nobr></td>
+	<td><nobr><%kummpk10%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Raumkosten</nobr></td>
+	<td><nobr><%jetzt11%></nobr></td>
+	<td><nobr><%jetztgl11%></nobr></td>
+	<td><nobr><%jetztgk11%></nobr></td>
+	<td><nobr><%jetztpk11%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm11%></nobr></td>
+	<td><nobr><%kummgl11%></nobr></td>
+	<td><nobr><%kummgk11%></nobr></td>
+	<td><nobr><%kummpk11%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>Betriebl.Steuern</nobr></td>
+	<td><nobr><%jetzt12%></nobr></td>
+	<td><nobr><%jetztgl12%></nobr></td>
+	<td><nobr><%jetztgk12%></nobr></td>
+	<td><nobr><%jetztpk12%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm12%></nobr></td>
+	<td><nobr><%kummgl12%></nobr></td>
+	<td><nobr><%kummgk12%></nobr></td>
+	<td><nobr><%kummpk12%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Versich./Beitr&auml;ge</nobr></td>
+	<td><nobr><%jetzt13%></nobr></td>
+	<td><nobr><%jetztgl13%></nobr></td>
+	<td><nobr><%jetztgk13%></nobr></td>
+	<td><nobr><%jetztpk13%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm13%></nobr></td>
+	<td><nobr><%kummgl13%></nobr></td>
+	<td><nobr><%kummgk13%></nobr></td>
+	<td><nobr><%kummpk13%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Kfz-Kosten (o.St.)</nobr></td>
+	<td><nobr><%jetzt14%></nobr></td>
+	<td><nobr><%jetztgl14%></nobr></td>
+	<td><nobr><%jetztgk14%></nobr></td>
+	<td><nobr><%jetztpk14%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm14%></nobr></td>
+	<td><nobr><%kummgl14%></nobr></td>
+	<td><nobr><%kummgk14%></nobr></td>
+	<td><nobr><%kummpk14%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>Werbe-/Reisekosten</nobr></td>
+	<td><nobr><%jetzt15%></nobr></td>
+	<td><nobr><%jetztgl15%></nobr></td>
+	<td><nobr><%jetztgk15%></nobr></td>
+	<td><nobr><%jetztpk15%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm15%></nobr></td>
+	<td><nobr><%kummgl15%></nobr></td>
+	<td><nobr><%kummgk15%></nobr></td>
+	<td><nobr><%kummpk15%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Kosten Warenabgabe</nobr></td>
+	<td><nobr><%jetzt16%></nobr></td>
+	<td><nobr><%jetztgl16%></nobr></td>
+	<td><nobr><%jetztgk16%></nobr></td>
+	<td><nobr><%jetztpk16%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm16%></nobr></td>
+	<td><nobr><%kummgl16%></nobr>
+</td>
+	<td><nobr><%kummgk16%></nobr></td>
+	<td><nobr><%kummpk16%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>Abschreibungen</nobr></td>
+	<td><nobr><%jetzt17%></nobr></td>
+	<td><nobr><%jetztgl17%></nobr></td>
+	<td><nobr><%jetztgk17%></nobr></td>
+	<td><nobr><%jetztpk17%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm17%></nobr></td>
+	<td><nobr><%kummgl17%></nobr></td>
+	<td><nobr><%kummgk17%></nobr></td>
+	<td><nobr><%kummpk17%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Reparatur/Instandh.</nobr></td>
+	<td><nobr><%jetzt18%></nobr></td>
+	<td><nobr><%jetztgl18%></nobr></td>
+	<td><nobr><%jetztgk18%></nobr></td>
+	<td><nobr><%jetztpk18%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm18%></nobr></td>
+	<td><nobr><%kummgl18%></nobr></td>
+	<td><nobr><%kummgk18%></nobr></td>
+	<td><nobr><%kummpk18%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>Sonstige Kosten</nobr></td>
+	<td><nobr><%jetzt20%></nobr></td>
+	<td><nobr><%jetztgl20%></nobr></td>
+	<td><nobr><%jetztgk20%></nobr></td>
+	<td><nobr><%jetztpk20%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm20%></nobr></td>
+	<td><nobr><%kummgl20%></nobr></td>
+	<td><nobr><%kummgk20%></nobr></td>
+	<td><nobr><%kummpk20%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey subtotal">
+	<td class="left"><nobr>Gesamtkosten</nobr></td>
+	<td><nobr><%jetztgesamtkosten%></nobr></td>
+	<td><nobr><%jetztglgesamtkosten%></nobr></td>
+	<td><nobr><%jetztgkgesamtkosten%></nobr></td>
+	<td><nobr><%jetztpkgesamtkosten%></nobr></td>
+	<td></td>
+	<td><nobr><%kummgesamtkosten%></nobr></td>
+	<td><nobr><%kummglgesamtkosten%></nobr></td>
+	<td><nobr><%kummgkgesamtkosten%></nobr></td>
+	<td><nobr><%kummpkgesamtkosten%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+	
+<tr class="grey subtotal">
+<td class="left"><nobr>Betriebsergebnis</nobr></td>
+	<td><nobr><%jetztbetriebsergebnis%></nobr></td>
+	<td><nobr><%jetztglbetriebsergebnis%></nobr>
+</td>
+	<td><nobr><%jetztgkbetriebsergebnis%></nobr></td>
+	<td><nobr><%jetztpkbetriebsergebnis%></nobr></td>
+	<td></td>
+	<td><nobr><%kummbetriebsergebnis%></nobr></td>
+	<td><nobr><%kummglbetriebsergebnis%></nobr>
+</td>
+	<td><nobr><%kummgkbetriebsergebnis%></nobr></td>
+	<td><nobr><%kummpkbetriebsergebnis%></nobr></td>
+	<td class="right">&nbsp;</td>
+	</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Zinsaufwand</nobr></td>
+	<td><nobr><%jetzt30%></nobr></td>
+	<td><nobr><%jetztgl30%></nobr></td>
+	<td><nobr><%jetztgk30%></nobr></td>
+	<td><nobr><%jetztpk30%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm30%></nobr></td>
+	<td><nobr><%kummgl30%></nobr></td>
+	<td><nobr><%kummgk30%></nobr></td>
+	<td><nobr><%kummpk30%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>&Uuml;brige Steuern</nobr></td>
+	<td><nobr><%jetzt19%></nobr></td>
+	<td><nobr><%jetztgl19%></nobr></td>
+	<td><nobr><%jetztgk19%></nobr></td>
+	<td><nobr><%jetztpk19%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm19%></nobr></td>
+	<td><nobr><%kummg191%></nobr></td>
+	<td><nobr><%kummgk19%></nobr></td>
+	<td><nobr><%kummpk19%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Sonst. neutr. Aufwand</nobr></td>
+	<td><nobr><%jetzt31%></nobr></td>
+	<td><nobr><%jetztgl31%></nobr></td>
+	<td><nobr><%jetztgk31%></nobr></td>
+	<td><nobr><%jetztpk31%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm31%></nobr></td>
+	<td><nobr><%kummgl31%></nobr></td>
+	<td><nobr><%kummgk31%></nobr></td>
+	<td><nobr><%kummpk31%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white subtotal">
+<td class="left"><nobr>Neutraler Aufwand</nobr></td>
+	<td><nobr><%jetztneutraleraufwand%></nobr></td>
+	<td><nobr><%jetztglneutraleraufwand%></nobr></td>
+	<td><nobr><%jetztgkneutraleraufwand%></nobr></td>
+	<td><nobr><%jetztpkneutraleraufwand%></nobr></td>
+	<td></td>
+	<td><nobr><%kummneutraleraufwand%></nobr></td>
+	<td><nobr><%kummglneutraleraufwand%></nobr></td>
+	<td><nobr><%kummgkneutraleraufwand%></nobr></td>
+	<td><nobr><%kummpkneutraleraufwand%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="white">
+	<td class="left"><nobr>Zinsertr&auml;ge</nobr></td>
+	<td><nobr><%jetzt32%></nobr></td>
+	<td><nobr><%jetztgl32%></nobr></td>
+	<td><nobr><%jetztgk32%></nobr></td>
+	<td><nobr><%jetztpk32%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm32%></nobr></td>
+	<td><nobr><%kummgl32%></nobr></td>
+	<td><nobr><%kummgk32%></nobr></td>
+	<td><nobr><%kummpk32%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Sonst. neutr. Ertr.</nobr></td>
+	<td><nobr><%jetzt33%></nobr></td>
+	<td><nobr><%jetztgl33%></nobr></td>
+	<td><nobr><%jetztgk33%></nobr></td>
+	<td><nobr><%jetztpk33%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm33%></nobr></td>
+	<td><nobr><%kummgl33%></nobr></td>
+	<td><nobr><%kummgk33%></nobr></td>
+	<td><nobr><%kummpk33%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+	<td class="left"><nobr>Verr.kalk.Kosten</nobr></td>
+	<td><nobr><%jetzt34%></nobr></td>
+	<td><nobr><%jetztgl34%></nobr>
+	<td><nobr><%jetztgk34%></nobr></td>
+	<td><nobr><%jetztpk34%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm34%></nobr></td>
+	<td><nobr><%kummgl34%></nobr></td>
+	<td><nobr><%kummgk34%></nobr></td>
+	<td><nobr><%kummpk34%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey subtotal">
+	<td class="left"><nobr>Neutraler Ertrag</nobr></td>
+	<td><nobr><%jetztneutralerertrag%></nobr></td>
+	<td><nobr><%jetztglneutralerertrag%></nobr></td>
+	<td><nobr><%jetztgkneutralerertrag%></nobr></td>
+	<td><nobr><%jetztpkneutralerertrag%></nobr></td>
+	<td></td>
+	<td><nobr><%kummneutralerertrag%></nobr></td>
+	<td><nobr><%kummglneutralerertrag%></nobr></td>
+	<td><nobr><%kummgkneutralerertrag%></nobr></td>
+	<td><nobr><%kummpkneutralerertrag%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+	
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+	<td class="left"><nobr>Ergebnis vor Steuern</nobr></td>
+	<td><nobr><%jetztergebnisvorsteuern%></nobr></td>
+	<td><nobr><%jetztglergebnisvorsteuern%></nobr></td>
+	<td><nobr><%jetztgkergebnisvorsteuern%></nobr></td>
+	<td><nobr><%jetztpkergebnisvorsteuern%></nobr></td>
+	<td></td>
+	<td><nobr><%kummergebnisvorsteuern%></nobr></td>
+	<td><nobr><%kummglergebnisvorsteuern%></nobr></td>
+	<td><nobr><%kummgkergebnisvorsteuern%></nobr></td>
+	<td><nobr><%kummpkergebnisvorsteuern%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+	
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey">
+	<td class="left"><nobr>Steuern Eink.u.Ertr.</nobr></td>
+	<td><nobr><%jetzt35%></nobr></td>
+	<td><nobr><%jetztgl35%></nobr></td>
+	<td><nobr><%jetztgk35%></nobr></td>
+	<td><nobr><%jetztpk35%></nobr></td>
+	<td></td>
+	<td><nobr><%kumm35%></nobr></td>
+	<td><nobr><%kummgl35%></nobr></td>
+	<td><nobr><%kummgk35%></nobr></td>
+	<td><nobr><%kummpk35%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+	
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+	<td class="left"><nobr>Vorl&auml;ufiges Ergebnis</nobr></td>
+	<td><nobr><%jetztergebnis%></nobr></td>
+	<td><nobr><%jetztglergebnis%></nobr></td>
+	<td><nobr><%jetztgkergebnis%></nobr></td>
+	<td><nobr><%jetztpkergebnis%></nobr></td>
+	<td></td>
+	<td><nobr><%kummergebnis%></nobr></td>
+	<td><nobr><%kummglergebnis%></nobr></td>
+	<td><nobr><%kummgkergebnis%></nobr></td>
+	<td><nobr><%kummpkergebnis%></nobr></td>
+	<td class="right">&nbsp;</td>
+</tr>
+	
+<tr class="white" id=last><td class="left right"
+colspan="11">&nbsp;</td></tr>
+
+<tr>
+	<td colspan=11 class=footer>W&auml;hrung: Euro - FiBu: LX Office ERP
+(Version <%version%>) - Formular: 11.01.2007</td>
+</tr>
+
+</table>
+</body>
diff --git a/templates/mastertemplates/German/check.tex b/templates/mastertemplates/German/check.tex
new file mode 100644
index 000000000..6086d457d
--- /dev/null
+++ b/templates/mastertemplates/German/check.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{17cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Rechnung} & \textbf{Ausgestellt}
+  & \textbf{Fällig} & \textbf{Verrechnet} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/credit_note.tex b/templates/mastertemplates/German/credit_note.tex
new file mode 100644
index 000000000..61cd7f369
--- /dev/null
+++ b/templates/mastertemplates/German/credit_note.tex
@@ -0,0 +1,90 @@
+\documentclass[twoside]{scrartcl}
+\usepackage{eurosym}
+\usepackage{tabularx}
+\usepackage{ifthen}
+\usepackage[utf8]{inputenc}
+\begin{document}
+
+\setlength{\parindent}{0cm}
+
+\pagestyle{empty}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+<%pagebreak 80 28 37%>
+\end{tabularx}
+
+\newpage
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+<%end pagebreak%>
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\begin{minipage}{8cm}
+  <%name%>
+
+  <%street%>
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{Gutschrift}}} \vspace*{0.2cm}
+  \rightline{\large\textbf{\textit{Nr. <%invnumber%>% \vspace*{0.2cm}
+  }}}
+  für Rechnung: \hfill <%invnumber_for_credit_note%>
+
+  Gutschriftdatum:\hfill <%invdate%>
+
+  Auftrag-Nr:\hfill <%ordnumber%>
+
+  Telefon:\hfill <%phone%>
+
+  Telefax:\hfill <%fax%>
+
+  Ansprechpartner:\hfill <%employee%>
+\end{minipage}
+
+\vspace*{0.5cm}
+
+Ihre Bestellung <%cusordnumber%> vom <%orddate%>
+% \hfill
+
+\vspace*{0.5cm}
+
+Sehr geehrte Damen und Herren,
+
+\vspace{0.5cm}
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> \euro & <%linetotal%> \euro \\
+    <%if discount_sub%> & Zwischensumme: &  & <%discount_sub%> \euro  & <%end if%>\\
+  <%end number%>\hline
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\ 
+  <%foreach tax%>
+  \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
+  <%end tax%>
+  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%invtotal%> \euro} \\ \hline
+\end{tabularx}
+
+\vspace{1cm}
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/income_statement.html b/templates/mastertemplates/German/income_statement.html
new file mode 100644
index 000000000..36b612b58
--- /dev/null
+++ b/templates/mastertemplates/German/income_statement.html
@@ -0,0 +1,291 @@
+<body>
+
+<h2 align=center>
+Einnahmen&uuml;berschu&szlig;rechnung</h2>
+<h3 align=center>-E&Uuml;R- (Gewinnermittlung nach &sect;4 Abs. 3 EStG)
+<br><%period%>
+</h3>
+
+<table width=100% border=0>
+<tr>
+  <td width=75% align=left colspan=2><font size="+1"><b>A. Betriebseinnahmen</font></b><br></td>
+  <td></td>
+</tr>
+
+<tr>
+  <td>
+	Umsatzerl&ouml;se  
+  </td>
+  <td>
+	<%eur1%>
+  </td>
+</tr>
+<tr>
+  <td>
+	sonstige Erl&ouml;se  
+  </td>
+  <td>
+	<%eur2%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Privatanteile
+  </td>
+  <td>
+	<%eur3%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Zinsertr&auml;ge
+  </td>
+  <td>
+	<%eur4%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Au&szlig;erordentliche Ertr&auml;ge
+  </td>
+  <td>
+	<%eur5%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Vereinnahmte Umsatzsteuer
+  </td>
+  <td>
+	<%eur6%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Umsatzsteuererstattungen
+  </td>
+  <td>
+	<%eur7%>  
+  </td>
+</tr>
+
+
+<tr>
+  <td> </td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <th align=left><b>Summe Einnahmen</b></th>
+  <td align=right><%sumeura%><hr noshade size=2></td>
+</tr>
+<tr>
+  <td></td>
+  <td><br><br></td>
+</tr>
+<tr>
+  <td align=left><font size="+1"><b>B. Betriebsausgaben</font></b><br></td>
+  <td></td>
+</tr>
+
+<tr>
+  <td>
+	Wareneing&auml;nge
+  </td>
+  <td>
+	<%eur8%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	L&ouml;hne und Geh&auml;ter
+  </td>
+  <td>
+	<%eur9%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Gesetzlicher sozialer Aufwand
+  </td>
+  <td>
+	<%eur10%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Mieten
+  </td>
+  <td>
+	<%eur11%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Gas, Strom, Wasser
+  </td>
+  <td>
+	<%eur12%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Instandhaltung
+  </td>
+  <td>
+	<%eur13%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Steuern, Versicherungen, Beitr&auml;ge
+  </td>
+  <td>
+	<%eur14%>  
+  </td>
+</tr>
+<tr>
+  <td>
+	Kfz-Steuern
+  </td>
+  <td>
+	<%eur15%>  
+  </td>
+</tr><tr>
+  <td>
+	Kfz-Versicherungen
+  </td>
+  <td>
+	<%eur16%>  
+  </td>
+</tr><tr>
+  <td>
+	Sonstige Fahrzeugkosten
+  </td>
+  <td>
+	<%eur17%>  
+  </td>
+</tr><tr>
+  <td>
+	Werbe- und Reisekosten
+  </td>
+  <td>
+	<%eur18%>  
+  </td>
+</tr><tr>
+  <td>
+	Instandhaltung und Werkzeuge
+  </td>
+  <td>
+	<%eur19%>  
+  </td>
+</tr><tr>
+  <td>
+	Fachzeitschriften, B&uuml;cher
+  </td>
+  <td>
+	<%eur20%>  
+  </td>
+</tr><tr>
+  <td>
+	Miete f&uuml;r Einrichtungen
+  </td>
+  <td>
+	<%eur21%>  
+  </td>
+</tr><tr>
+  <td>
+	Rechts- und Beratungskosten
+  </td>
+  <td>
+	<%eur22%>  
+  </td>
+</tr><tr>
+  <td>
+	B&uuml;robedarf, Porto, Telefon
+  </td>
+  <td>
+	<%eur23%>  
+  </td>
+</tr><tr>
+  <td>
+	Sonstige Aufwendungen
+  </td>
+  <td>
+	<%eur24%>  
+  </td>
+</tr><tr>
+  <td>
+	Abschreibungen auf Anlageverm&ouml;gen
+  </td>
+  <td>
+	<%eur25%>  
+  </td>
+</tr><tr>
+  <td>
+	Abschreibungen auf GWG
+  </td>
+  <td>
+	<%eur26%>  
+  </td>
+</tr><tr>
+  <td>
+	Vorsteuer
+  </td>
+  <td>
+	<%eur27%>  
+  </td>
+</tr><tr>
+  <td>
+	Umsatzsteuerzahlungen
+  </td>
+  <td>
+	<%eur28%>  
+  </td>
+</tr><tr>
+  <td>
+	Zinsaufwand
+  </td>
+  <td>
+	<%eur29%>  
+  </td>
+</tr><tr>
+  <td>
+	Au&szlig;erordentlicher Aufwand
+  </td>
+  <td>
+	<%eur30%>  
+  </td>
+</tr><tr>
+  <td>
+	Betriebliche Steuern
+  </td>
+  <td>
+	<%eur31%>  
+  </td>
+</tr>
+
+
+<tr>
+  <td> </td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <th align=left><b>Summe Ausgaben</b></th>
+  <td align=right><%sumeurb%> <br><hr noshade size=2</td>
+</tr>
+<tr>
+  <td></td>
+  <td><br><br></td>
+</tr>
+<tr valign=top>
+  <td align=left>GEWINN / VERLUST</td>
+  <td align=right><%guvsumme%><br><hr noshade size=2></td>
+</tr>
+
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/German/invoice.html b/templates/mastertemplates/German/invoice.html
new file mode 100644
index 000000000..2858f4f08
--- /dev/null
+++ b/templates/mastertemplates/German/invoice.html
@@ -0,0 +1,268 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telefon <%tel%>
+      <br>Telefax <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>R E C H N U N G</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Ausgestellt am</th><td width=10>&nbsp;</td><td><%invdate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Bezahlbar bis</th><td width=10>&nbsp;</td><td><%duedate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Nummer</th><td>&nbsp;</td><td><%invnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <th align=right>Lieferdatum</th><td>&nbsp;</td><td><%deliverydate%></td></tr>
+    </tr>
+<!--
+    <tr>
+      <th align=right>Clerk:</th><td>&nbsp;</td><td><%username%></td>
+    </tr>
+-->
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>An:</th>
+      <th align=left><font color=ffffff>Lieferaddresse:</th>
+    </tr>
+
+<!--
+     other variables which can be use:
+     contact, shiptocontact, shiptophone, shiptofax
+-->
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+      
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Nummer</th>
+      <th align=left><font color=ffffff>Beschreibung</th>
+      <th><font color=ffffff>Anz.</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Rab</th>
+      <th><font color=ffffff>Total</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+<!--
+you can also use netprice instead of sellprice if you
+don't want to show the discount
+netprice = sellprice - discount
+-->
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+<%if taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%invtotal%></td>
+    </tr>
+<%end taxincluded%>
+<%if not taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+<%end taxincluded%>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%> auf <%taxbase%></th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+<%if paid%>
+    <tr>
+      <th colspan=5 align=right>Bezahlt</th>
+      <td colspan=2 align=right>- <%paid%></td>
+    </tr>
+<%end paid%>
+
+    <tr>
+      <td colspan=3>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>Bezahlbar innerhalb von <b><%terms%></b> Tagen</td>
+<%if total%>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+<%end total%>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen:</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Rechnung ist bezahlbar innerhalb von <%terms%> Tagen.
+    Nach dem <%duedate%> werden Zinsen zu einem
+    monatlichen Satz von 1.5% verrechnet.
+    Waren bleiben im Besitz von <%company%> bis die Rechnung voll bezahlt ist.
+    Rückgaben werden mit 10% Lagergebühren belastet. Beschädigte Waren
+    und Waren ohne eine Rückgabenummer werden nicht entgegengenommen.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+<%foreach tax%>
+  <tr>
+    <th colspan=7 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
+  </tr>
+<%end tax%>
+
+<%if taxincluded%>
+  <tr>
+    <th colspan=7 align=left><font size=-2>Steuern sind im Preis inbegriffen.</th>
+  </tr>
+<%end taxincluded%>
+
+<!-- business number
+  <tr>
+    <th colspan=7 align=left><font size=-2>Business Number: <%businessnumber%></font></th>
+  </tr>
+-->
+
+  <tr>
+    <th colspan=7 align=left>
+    <hr>
+    <br>Bankverbindung
+    <br>Bank
+    <br>Bankleitzahl
+    <br>Konto No.
+    </td>
+  </tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/German/invoice.odt b/templates/mastertemplates/German/invoice.odt
new file mode 100644
index 000000000..822ba9062
Binary files /dev/null and b/templates/mastertemplates/German/invoice.odt differ
diff --git a/templates/mastertemplates/German/invoice.tex b/templates/mastertemplates/German/invoice.tex
new file mode 100644
index 000000000..96fe5023b
--- /dev/null
+++ b/templates/mastertemplates/German/invoice.tex
@@ -0,0 +1,95 @@
+\documentclass[twoside]{scrartcl}
+\usepackage{eurosym}
+\usepackage{tabularx}
+\usepackage{ifthen}
+\usepackage[utf8]{inputenc}
+\begin{document}
+
+\setlength{\parindent}{0cm}
+
+\pagestyle{empty}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+<%pagebreak 80 28 37%>
+\end{tabularx}
+
+\newpage
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+<%end pagebreak%>
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\begin{minipage}{8cm}
+  <%name%>
+
+  <%street%>
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{Rechnung}}} \vspace*{0.2cm}
+  \rightline{\large\textbf{\textit{Nr. <%invnumber%>% \vspace*{0.2cm}
+  }}}
+
+  Rechnungsdatum:\hfill <%invdate%>
+
+  Auftrag-Nr:\hfill <%ordnumber%>
+
+  Telefon:\hfill <%phone%>
+
+  Telefax:\hfill <%fax%>
+
+  Ansprechpartner:\hfill <%employee%>
+\end{minipage}
+
+\vspace*{0.5cm}
+
+Ihre Bestellung <%cusordnumber%> vom <%orddate%>
+% \hfill
+
+
+\vspace*{0.5cm}
+
+Sehr geehrte Damen und Herren,
+
+für unsere erbrachten Lieferungen und Leistungen erlauben wir uns,
+folgende Positionen in Rechnung zu stellen.
+
+\vspace{0.5cm}
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> \euro & <%linetotal%> \euro \\
+    <%if discount_sub%> & Zwischensumme: &  & <%discount_sub%> \euro  & <%end if%>\\
+  <%end number%>\hline
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\ 
+  <%foreach tax%>
+  \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
+  <%end tax%>
+  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%invtotal%> \euro} \\ \hline
+\end{tabularx}
+
+\vspace{1cm}
+\ifthenelse{\equal{<%deliverydate%>}{}}{Das Leistungsdatum entspricht, soweit nicht anders angegeben, dem Rechnungsdatum.}{Liefertermin: <%deliverydate%>} \\
+Zahlbar bis <%duedate%> in Summe <%invtotal%> \euro\ ohne Abzüge.
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/pick_list.html b/templates/mastertemplates/German/pick_list.html
new file mode 100644
index 000000000..0de88eb5b
--- /dev/null
+++ b/templates/mastertemplates/German/pick_list.html
@@ -0,0 +1,154 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	  <h4>
+	  <%company%>
+	  <br><%address%>
+	  </h4>
+	  </td>
+
+	  <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+	  <td align=right>
+	  <h4>
+	  Tel: <%tel%>
+	  <br>Fax: <%fax%>
+	  </h4>
+	  </td>
+	</tr>
+
+	<tr>
+	  <th colspan=3>
+	    <h4>S A M M E L L I S T E</h4>
+	  </th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% callspacing=0 cellpadding=0>
+        <tr bgcolor=000000>
+	  <th width=50% align=left><font color=ffffff>Lieferanschrift:</th>
+	  <th width=50%>&nbsp;</th>
+	</tr>
+
+	<tr valign=top>
+	  <td><%shiptoname%>
+	  <br><%shiptostreet%>
+	  <br><%shiptozipcode%>
+	  <br><%shiptocity%>
+	  <br><%shiptocountry%>
+	  </td>
+
+	  <td>
+	  <%if shiptocontact%>
+	  <br>Kontakt: <%shiptocontact%>
+	  <%end shiptocontact%>
+
+	  <%if shiptophone%>
+	  <br>Tel: <%shiptophone%>
+	  <%end shiptophone%>
+
+	  <%if shiptofax%>
+	  <br>Fax: <%shiptofax%>
+	  <%end shiptofax%>
+
+	  <%shiptoemail%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr height=5></tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% border=1>
+        <tr>
+	  <th width=17% align=left>BestellNr. #</th>
+	  <th width=17% align=left>Datum</th>
+	  <th width=17% align=left nowrap>Kontakt</th>
+	  <%if warehouse%>
+	  <th width=17% align=left>Lager</th>
+	  <%end warehouse%>
+	  <th width=17% align=left>Versandort</th>
+	  <th width=15% align=left>Transportmittel</th>
+	</tr>
+
+        <tr>
+	  <td><%ordnumber%>&nbsp;</td>
+
+	  <%if shippingdate%>
+	  <td><%shippingdate%></td>
+	  <%end shippingdate%>
+
+	  <%if not shippingdate%>
+	  <td><%orddate%></td>
+	  <%end shippingdate%>
+
+	  <td><%employee%>&nbsp;</td>
+
+	  <%if warehouse%>
+	  <td><%warehouse%>&nbsp;</td>
+	  <%end warehouse%>
+
+	  <td><%shippingpoint%>&nbsp;</td>
+	  <td><%shipvia%>&nbsp;</td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100%>
+	<tr bgcolor=000000>
+	  <th align=left><font color=ffffff>Pos</th>
+	  <th align=left><font color=ffffff>Nummer</th>
+	  <th align=left><font color=ffffff>Beschreibung</th>
+	  <th><font color=ffffff>Menge</th>
+	  <th><font color=ffffff>geliefert</th>
+	  <th>&nbsp;</th>
+	  <th><font color=ffffff>Lagerplatz</th>
+	</tr>
+
+        <%foreach number%>
+	<tr valign=top>
+	  <td><%runningnumber%>
+	  <td><%number%></td>
+	  <td><%description%></td>
+	  <td align=right><%qty%></td>
+	  <td align=right>[&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]</td>
+	  <td><%unit%></td>
+	  <td align=right><%bin%></td>
+	</tr>
+	<%end number%>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td><hr noshade></td>
+  </tr>
+
+</table>
+
diff --git a/templates/mastertemplates/German/pick_list.tex b/templates/mastertemplates/German/pick_list.tex
new file mode 100644
index 000000000..d560e0684
--- /dev/null
+++ b/templates/mastertemplates/German/pick_list.tex
@@ -0,0 +1,139 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\usepackage{graphicx}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{17cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\vspace*{-1.3cm}
+
+\parbox{\textwidth}{
+  \parbox[b]{.42\textwidth}{
+    <%company%>
+    
+    <%address%>
+  }\hfill
+  \begin{tabular}[b]{rr@{}}
+  Tel & <%tel%>\\
+  Fax & <%fax%>
+  \end{tabular}
+
+  \rule[1.5ex]{\textwidth}{0.5pt}
+}
+
+ 
+<%pagebreak 90 27 37%>
+\end{tabular*}
+
+\newpage
+
+\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
+  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
+  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.5\textwidth}{
+  \textbf{Lieferanschrift}
+} \hfill
+
+\vspace{0.7cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.5\textwidth}{
+
+<%shiptoname%> \\
+<%shiptostreet%> \\
+<%shiptozipcode%> \\
+<%shiptocity%> \\
+<%shiptocountry%>
+}
+\parbox[t]{.4\textwidth}{
+  <%shiptocontact%>
+
+  <%if shiptophone%>
+  Tel: <%shiptophone%>
+  <%end shiptophone%>
+
+  <%if shiptofax%>
+  Fax: <%shiptofax%>
+  <%end shiptofax%>
+
+  <%shiptoemail%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{S A M M E L L I S T E}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{BestellNr. \#} & \textbf{Datum} & \textbf{Kontakt}
+  <%if warehouse%>
+  & \textbf{Lager}
+  <%end warehouse%>
+  & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5em]
+  \hline
+  <%ordnumber%>
+  <%if shippingdate%>
+  & <%shippingdate%>
+  <%end shippingdate%>
+  <%if not shippingdate%>
+  & <%orddate%>
+  <%end shippingdate%>
+  & <%employee%>
+  <%if warehouse%>
+  & <%warehouse%>
+  <%end warehouse%>
+  & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
+  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
+  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
+<%foreach number%>
+  <%runningnumber%> & <%number%> & <%description%> &
+  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/purchase_order.html b/templates/mastertemplates/German/purchase_order.html
new file mode 100644
index 000000000..e83c67a2b
--- /dev/null
+++ b/templates/mastertemplates/German/purchase_order.html
@@ -0,0 +1,188 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telefon <%tel%>
+      <br>Telefax <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>B E S T E L L U N G</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Bestellungsdatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Lieferbar bis</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>An:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Nummer</th>
+      <th align=left><font color=ffffff>Artikel</th>
+      <th><font color=ffffff>Anz</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Total</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=6><hr noshade></td>
+    </tr>
+    
+    <tr>
+      <th colspan=4 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=2>Netto <b><%terms%></b> Tage</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    &nbsp;
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/German/purchase_order.tex b/templates/mastertemplates/German/purchase_order.tex
new file mode 100644
index 000000000..715bd1b98
--- /dev/null
+++ b/templates/mastertemplates/German/purchase_order.tex
@@ -0,0 +1,85 @@
+\documentclass[twoside]{scrartcl}
+\usepackage{eurosym}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\begin{document}
+
+\thispagestyle{empty}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\setlength{\parindent}{0cm}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+<%pagebreak 80 28 37%>
+\end{tabularx}
+
+\newpage
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> & <%linetotal%>\\
+  <%end number%>
+
+<%end pagebreak%>
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\begin{minipage}{8cm}
+  <%name%>
+
+  <%street%>
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{Bestellung}}}
+  \rightline{\large\textbf{\textit{Nr. <%ordnumber%>%
+  }}}
+
+  Datum:\hfill <%orddate%>
+
+  Kunden-Nr:\hfill <%customernumber%>
+
+  Telefon:\hfill <%phone%>
+
+  Telefax:\hfill <%fax%>
+
+  Ansprechpartner:\hfill <%employee%>
+\end{minipage}
+
+\vspace*{0.5cm}
+
+
+Hiermit bestellen wir verbindlich folgende Positionen:
+\vspace{0.5cm}
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> \euro  & <%linetotal%> \euro \\
+  <%end number%> \hline
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro\\
+  <%foreach tax%>
+    \multicolumn{4}{l}{<%taxdescription%>} & <%tax%>\euro \\
+  <%end tax%>
+  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%ordtotal%> \euro} \\
+\end{tabularx}
+\hrule
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/receipt.tex b/templates/mastertemplates/German/receipt.tex
new file mode 100644
index 000000000..6086d457d
--- /dev/null
+++ b/templates/mastertemplates/German/receipt.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{17cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Rechnung} & \textbf{Ausgestellt}
+  & \textbf{Fällig} & \textbf{Verrechnet} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/request_quotation.html b/templates/mastertemplates/German/request_quotation.html
new file mode 100644
index 000000000..6ff003634
--- /dev/null
+++ b/templates/mastertemplates/German/request_quotation.html
@@ -0,0 +1,194 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58>
+    </td>
+
+    <td align=right>
+      <h4>
+      Tel: <%tel%>
+      <br>Fax: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>A N F R A G E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left width=50%><font color=ffffff>Rechnungsanschrift:</th>
+      <th align=left width=50%><font color=ffffff>Lieferanschrift:</th>
+    </tr>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<br>
+<%if contact%>
+<br>Kontakt: <%contact%>
+<%end contact%>
+<%if vendorphone%>
+<br>Tel: <%vendorphone%>
+<%end vendorphone%>
+<%if vendorfax%>
+<br>Fax: <%vendorfax%>
+<%end vendorfax%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+<br>
+<%if shiptocontact%>
+<br>Kontakt: <%shiptocontact%>
+<%end shiptocontact%>
+<%if shiptophone%>
+<br>Tel: <%shiptophone%>
+<%end shiptophone%>
+<%if shiptofax%>
+<br>Fax: <%shiptofax%>
+<%end shiptofax%>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr><td>&nbsp;</td></tr>
+
+  <tr>
+    <td colspan=2>
+    <table width=100% border=1>
+    <tr>
+      <th width=17% align=left>AnfrageNr. #</th>
+      <th width=17% align=left>Datum</th>
+      <th width=17% align=left>Erforderlich am</th>
+      <th width=17% align=left>Kontakt</th>
+      <th width=17% align=left>Lagerplatz</th>
+      <th width=15% align=left>Versand mit:</th>
+    </tr>
+
+    <tr>
+      <td><%quonumber%></td>
+      <td><%quodate%></td>
+      <td><%reqdate%></td>
+      <td><%employee%></td>
+      <td><%shippingpoint%></td>
+      <td><%shipvia%></td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr height="10"></tr>
+
+  <tr>
+    <td>Bitte teilen Sie uns Preise und Lieferzeit für folgende Artikel mit:</td>
+  </tr>
+
+  <tr height="10"></tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr>
+<!--      <th align=right>No.</th>  -->
+      <th align=left>ArtNr.</th>
+      <th align=left>Beschreibung</th>
+      <th>Menge</th>
+      <th>&nbsp;</th>
+      <th>Lieferung</th>
+      <th>Stückpreis</th>
+      <th>Gesamtpreis</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+other per line item variables available <%reqdate%>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+<%if notes%>
+    <tr valign=top>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+    </tr>
+<%end notes%>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td width=70%>&nbsp;</td>
+
+    <td width=30%>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/German/request_quotation.tex b/templates/mastertemplates/German/request_quotation.tex
new file mode 100644
index 000000000..f17eb629f
--- /dev/null
+++ b/templates/mastertemplates/German/request_quotation.tex
@@ -0,0 +1,173 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage{graphicx}
+\usepackage{german}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{17cm}
+\setlength{\textheight}{24.7cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{12cm}
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\pagestyle{myheadings}
+\thispagestyle{empty}
+
+\vspace*{-1.3cm}
+
+\parbox{\textwidth}{
+  \parbox[b]{.42\textwidth}{
+    <%company%>
+
+    <%address%>
+  }\hfill
+  \begin{tabular}[b]{rr@{}}
+  Tel & <%tel%>\\
+  Fax & <%fax%>
+  \end{tabular}
+
+  \rule[1.5ex]{\textwidth}{0.5pt}
+}
+
+
+<%pagebreak 90 27 48%>
+\end{tabular*}
+
+  \rule{\textwidth}{2pt}
+
+  \hfill
+  \begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Zwischenzumme} & \textbf{<%sumcarriedforward%>} \\
+  \end{tabularx}
+
+\newpage
+
+\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
+  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\
+<%end pagebreak%>
+
+
+\vspace*{0.5cm}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{.45\textwidth}{
+\textbf{To}
+\vspace{0.7cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{0.3cm}
+
+<%if contact%>
+<%contact%>
+<%end contact%>
+
+\vspace{0.2cm}
+
+<%if vendorphone%>
+Tel: <%vendorphone%>
+<%end vendorphone%>
+
+<%if vendorfax%>
+Fax: <%vendorfax%>
+<%end vendorfax%>
+
+<%email%>
+}
+\parbox[t]{.45\textwidth}{
+\textbf{Lieferanschrift}
+\vspace{0.7cm}
+
+<%shiptoname%>
+
+<%shiptostreet%>
+
+<%shiptozipcode%>
+
+<%shiptocity%>
+
+<%shiptocountry%>
+
+\vspace{0.3cm}
+
+<%if shiptocontact%>
+<%shiptocontact%>
+<%end shiptocontact%>
+
+<%if shiptophone%>
+Tel: <%shiptophone%>
+<%end shiptophone%>
+
+<%if shiptofax%>
+Fax: <%shiptofax%>
+<%end shiptofax%>
+
+<%shiptoemail%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{A N F R A G E}
+\hfill
+
+\vspace{1cm}
+
+\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
+  \textbf{AnfrageNr. \#} & \textbf{Datum} & \textbf{Benötigt am} & \textbf{Kontakt} & \textbf{Lagerplatz} & \textbf{Lieferung mit} \\ [0.5ex]
+  \hline
+  <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  \hline
+\end{tabularx}
+
+\vspace{1cm}
+
+Bitte nennen Sie uns für folgende Artikel Preis und Liefertermin:
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
+  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> & <%unit%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\hfill
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/sales_delivery_order.tex b/templates/mastertemplates/German/sales_delivery_order.tex
new file mode 100644
index 000000000..d2ecab214
--- /dev/null
+++ b/templates/mastertemplates/German/sales_delivery_order.tex
@@ -0,0 +1,78 @@
+\documentclass[twoside]{scrartcl}
+\usepackage{eurosym}
+\usepackage{tabularx}
+\usepackage{ifthen}
+\usepackage[utf8]{inputenc}
+\begin{document}
+
+\setlength{\parindent}{0cm}
+
+\pagestyle{empty}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+<%pagebreak 80 28 37%>
+\end{tabularx}
+
+\newpage
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+<%end pagebreak%>
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\begin{minipage}{8cm}
+  <%name%>
+
+  <%street%>
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{Lieferschein}}} \vspace*{0.2cm}
+  \rightline{\large\textbf{\textit{Nr. <%donumber%>% \vspace*{0.2cm}
+  }}}
+
+  Lieferscheindatum:\hfill <%dodate%>
+
+  Kunden-Nr:\hfill <%customernumber%>
+
+  Telefon:\hfill <%phone%>
+
+  Telefax:\hfill <%fax%>
+
+  Ansprechpartner:\hfill <%employee%>
+\end{minipage}
+
+\vspace*{0.5cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl@{}}
+  \textbf{Nummer} & \textbf{Artikel} & \textbf{Anz} & \textbf{Einh}  \\
+
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> & <%unit%>   \\
+    & <%serialnumber%>  & & \\
+<%end number%>
+\end{tabular*}
+
+\vspace{1cm}
+<%if deliverydate%>
+        Die Auslieferung/Fertigstellung erfolgte am : <%deliverydate%>
+<%end if%>
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/sales_order.html b/templates/mastertemplates/German/sales_order.html
new file mode 100644
index 000000000..4cbe20afb
--- /dev/null
+++ b/templates/mastertemplates/German/sales_order.html
@@ -0,0 +1,213 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telefon <%tel%>
+      <br>Telefax <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>B E S T E L L U N G</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Bestelldatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Lieferbar bei</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>Verrechnet An:</th>
+      <th align=left><font color=ffffff>Lieferaddresse:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Nummer</th>
+      <th align=left><font color=ffffff>Artikel</th>
+      <th><font color=ffffff>Anz</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Rab</th>
+      <th><font color=ffffff>Total</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+<%if taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%ordtotal%></td>
+    </tr>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+<%end taxincluded%>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%> auf <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=5><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>Netto <b><%terms%></b> Tage</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%ordtotal%></th>
+    </tr>
+<%if taxincluded%>
+    <tr>
+      <td colspan=3>Steuern sind im Preis inbegriffen</td>
+    </tr>
+<%end taxincluded%>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Spezialprodukte werden nicht zurückgenommen. Für alle anderen Waren
+    wird eine 10% Stornogebühr verrechnet.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/German/sales_order.tex b/templates/mastertemplates/German/sales_order.tex
new file mode 100644
index 000000000..f4b43a779
--- /dev/null
+++ b/templates/mastertemplates/German/sales_order.tex
@@ -0,0 +1,90 @@
+\documentclass[twoside]{scrartcl}
+\usepackage{eurosym}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\begin{document}
+
+\thispagestyle{empty}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\setlength{\parindent}{0cm}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+<%pagebreak 80 28 37%>
+\end{tabularx}
+
+\newpage
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> & <%linetotal%>\\
+  <%end number%>
+<%end pagebreak%>
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\begin{minipage}{8cm}
+  <%name%>
+
+  <%street%>
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{Auftragsbestätigung}}} \vspace*{0.2cm}
+  \rightline{\large\textbf{\textit{Nr. <%ordnumber%>%
+  }}} \vspace*{0.2cm}
+
+  Datum:\hfill <%orddate%>
+
+  Kunden-Nr:\hfill <%customernumber%>
+
+  Telefon:\hfill <%phone%>
+
+  Telefax:\hfill <%fax%>
+
+  Ansprechpartner:\hfill <%employee%>
+\end{minipage}
+
+\vspace*{0.5cm}
+
+\hfill
+
+\vspace{0.5cm}
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> \euro  & <%linetotal%> \euro \\
+  <%end number%> \hline
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro\\
+  <%foreach tax%>
+    \multicolumn{4}{l}{<%taxdescription%>} & <%tax%>\euro \\
+  <%end tax%>
+  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%ordtotal%> \euro} \\
+\end{tabularx}
+\hrule
+
+\vspace{1cm}
+Vereinbarter Liefertermin: <%reqdate%> \\ \\
+\textit{Bitte kontrollieren Sie alle Positionen auf Übereinstimmung
+  mit Ihrer Bestellung! Abweichungen teilen Sie innerhalb von 3 Tagen
+  mit!} \\ \\
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/sales_quotation.html b/templates/mastertemplates/German/sales_quotation.html
new file mode 100644
index 000000000..138063154
--- /dev/null
+++ b/templates/mastertemplates/German/sales_quotation.html
@@ -0,0 +1,221 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr valign=top>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+    <td align=right>
+      <h4>
+      Tel: <%tel%>
+      <br>Fax: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+<tr><td colspan=3>&nbsp;</td></tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>A N G E B O T</h4>
+    </th>
+  </tr>
+
+  </table>
+
+  <table width=100% callspacing=0 cellpadding=0>
+
+  <tr>
+    <td>
+    <table width=100%>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<br>
+<%if contact%>
+<br>Kontakt: <%contact%>
+<%end contact%>
+
+<%if customerphone%>
+<br>Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+<br>Fax: <%customerfax%>
+<%end customerfax%>
+
+<%if email%>
+<br><%email%>
+<%end email%>
+      </td>
+
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr><td>&nbsp;</td></tr>
+
+  <tr>
+    <td colspan=2>
+      <table width=100% border=1>
+        <tr>
+	  <th width=17% align=left nowrap>Nummer</th>
+	  <th width=17% align=left>Datum</th>
+	  <th width=17% align=left>Gültig bis</th>
+	  <th width=17% align=left nowrap>Kontakt</th>
+	  <th width=17% align=left nowrap>Lagerplatz</th>
+	  <th width=15% align=left nowrap>Lieferung mit</th>
+	</tr>
+
+	<tr>
+	  <td><%quonumber%></td>
+	  <td><%quodate%></td>
+	  <td><%reqdate%></td>
+	  <td><%employee%></td>
+	  <td><%shippingpoint%></td>
+	  <td><%shipvia%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=right><font color=ffffff>Nr.</th>
+      <th align=left><font color=ffffff>Artikelnummer</th>
+      <th align=left><font color=ffffff>Beschreibung</th>
+      <th><font color=ffffff>Menge</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Rabatt</th>
+      <th><font color=ffffff>Gesamtpreis</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+    <td align=right><%runningnumber%></td>
+
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=8><hr noshade></td>
+    </tr>
+
+    <tr>
+<%if taxincluded%>
+      <th colspan=6 align=right>Gesamtbetrag netto</th>
+      <td colspan=2 align=right><%invtotal%></td>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+      <th colspan=6 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=6 align=right><%taxdescription%> von <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=4>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=4>&nbsp;
+<%if terms%>
+      Zahlungsziel <b><%terms%></b> Tage
+<%end terms%>
+      </td>
+      <th colspan=2 align=right>Gesamtbetrag brutto</th>
+      <th colspan=2 align=right><%quototal%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b> Euro
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td width=60%><font size=-3>
+    Spezialanfertigungen können nicht zurückgenommen werden.
+    </font>
+    </td>
+    <td width=40%>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
+
diff --git a/templates/mastertemplates/German/sales_quotation.odt b/templates/mastertemplates/German/sales_quotation.odt
new file mode 100644
index 000000000..d42a867ec
Binary files /dev/null and b/templates/mastertemplates/German/sales_quotation.odt differ
diff --git a/templates/mastertemplates/German/sales_quotation.tex b/templates/mastertemplates/German/sales_quotation.tex
new file mode 100644
index 000000000..8fdbace74
--- /dev/null
+++ b/templates/mastertemplates/German/sales_quotation.tex
@@ -0,0 +1,95 @@
+\documentclass[twoside]{scrartcl}
+\usepackage{eurosym}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\begin{document}
+
+\thispagestyle{empty}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+\setlength{\parindent}{0cm}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+<%pagebreak 80 28 37%>
+\end{tabularx}
+
+\newpage
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> & <%linetotal%>\\
+  <%end number%>
+<%end pagebreak%>
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{1.5cm}
+
+\begin{minipage}{8cm}
+  <%name%>
+
+  <%street%>
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{Angebot}}}
+  \rightline{\large\textbf{\textit{Nr. <%quonumber%>%
+  }}}
+
+  Datum:\hfill <%transdate%>
+
+  Kunden-Nr:\hfill <%customernumber%>
+
+  Telefon:\hfill <%phone%>
+
+  Telefax:\hfill <%fax%>
+
+  Ansprechpartner:\hfill <%employee%>
+\end{minipage}
+
+\vspace*{0.5cm}
+
+\hfill
+
+\vspace{0.5cm}
+
+\begin{tabularx}{\textwidth}{lrXrr}
+  \hline
+  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
+  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
+  \hline
+  <%foreach number%>
+    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
+    <%sellprice%> \euro & <%linetotal%> \euro \\
+  <%end number%> \hline
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\
+  <%foreach tax%>
+  \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
+  <%end tax%>
+  \multicolumn{4}{l}{\textbf{Endbetrag}} & \textbf{<%ordtotal%> \euro }
+\end{tabularx}
+\hrule
+
+\vspace{0.2cm}
+
+Wir danken für Ihre Anfrage und hoffen, Ihnen hiermit ein interessantes Angebot gemacht zu haben. Das Angebot ist
+  gültig bis zum <%reqdate%>. Sollten Sie noch Fragen oder Änderungswünsche haben, können Sie uns gerne jederzeit
+  unter den oben genannten Telefonnummern oder eMail-Adressen kontaktieren. \\
+  Bei der Durchführung des Auftrags gelten unsere AGB, die wir Ihnen gerne zuschicken. \\ \\
+  Mit freundlichen Grüßen, \\ \\ \\
+  <%employee_name%>
+
+
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/statement.html b/templates/mastertemplates/German/statement.html
new file mode 100644
index 000000000..37e612c3d
--- /dev/null
+++ b/templates/mastertemplates/German/statement.html
@@ -0,0 +1,121 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	    <h4>
+	    <%company%>
+	    <br><%address%>
+	    </h4>
+	  </td>
+	  <th></th>
+	  <td align=right>
+	  <h4>
+	  Tel: <%tel%>
+	  <br>Fax: <%fax%>
+	  </h4>
+	  </td>
+	</tr>
+	<tr>
+	  <th colspan=3><h4>S T A T E M E N T</h4></th>
+	</tr>
+	<tr>
+	  <td colspan=3 align=right><%statementdate%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr valign=top>
+	  <td><%name%>
+	  <br><%street%>
+	  <br><%zipcode%>
+	  <br><%city%>
+	  <br><%country%>
+	  <br>
+<%if customerphone%>
+	  <br>Tel: <%customerphone%>
+<%end customerphone%>
+<%if customerfax%>
+	  <br>Fax: <%customerfax%>
+<%end customerfax%>
+<%if email%>
+	  <br><%email%>
+<%end email%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+        <tr>
+	  <th align=left>Invoice #</th>
+	  <th width=15%>Date</th>
+	  <th width=15%>Due</th>
+	  <th width=10%>Current</th>
+	  <th width=10%>30</th>
+	  <th width=10%>60</th>
+	  <th width=10%>90+</th>
+	</tr>
+<%foreach invnumber%>
+	<tr>
+	  <td><%invnumber%></td>
+	  <td><%invdate%></td>
+	  <td><%duedate%></td>
+	  <td align=right><%c0%></td>
+	  <td align=right><%c30%></td>
+	  <td align=right><%c60%></td>
+	  <td align=right><%c90%></td>
+	</tr>
+<%end invnumber%>
+        <tr>
+	  <td colspan=7><hr size=1></td>
+	</tr>
+	<tr>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <th align=right><%c0total%></td>
+	  <th align=right><%c30total%></td>
+	  <th align=right><%c60total%></td>
+	  <th align=right><%c90total%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td align=right>
+      <table width=50%>
+        <tr>
+	  <th>Total Outstanding</th>
+          <th align=right><%total%></th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><hr noshade></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>Please make check payable to <b><%company%></b>.
+    </td>
+  </tr>
+  <tr height=20></tr>
+</table>
+
diff --git a/templates/mastertemplates/German/statement.tex b/templates/mastertemplates/German/statement.tex
new file mode 100644
index 000000000..f2d0e496f
--- /dev/null
+++ b/templates/mastertemplates/German/statement.tex
@@ -0,0 +1,137 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{17cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{9cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+
+      <%address%>}\hfill
+    \begin{tabular}[b]{rrr@{}}
+    Tel & <%tel%>\\
+    Fax & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
+
+\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}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{10.5cm}{
+  
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+}
+\parbox[t]{7.5cm}{
+<%if customerphone%>
+Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+Fax: <%customerfax%>
+<%end customerfax%>
+
+<%email%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{S T A T E M E N T} \hfill
+
+\hfill <%statementdate%>
+
+\vspace{2cm}
+
+\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
+  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
+  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
+<%foreach invnumber%>
+  <%invnumber%> & <%invdate%> & <%duedate%> &
+  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
+<%end invnumber%>
+\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
+\end{tabular*}
+\rule{\textwidth}{1pt}
+
+\vspace{1cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Total outstanding} & <%total%>
+\end{tabularx}
+
+\vfill
+
+Please make check payable to <%company%>
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\footnotetext[1]{\tiny
+}
+
+\end{document}
+
diff --git a/templates/mastertemplates/German/taxbird.txb b/templates/mastertemplates/German/taxbird.txb
new file mode 100644
index 000000000..c1a8a39cc
--- /dev/null
+++ b/templates/mastertemplates/German/taxbird.txb
@@ -0,0 +1,23 @@
+;; This file was produced by lx-office
+;; for using in taxbird. 
+;; You probably don't want to touch this 
+;; file. In case you do want it anyway, 
+;; be warned: BE CAREFUL!!
+;;
+'("Umsatzsteuervoranmeldung <%year%>" (
+("vend-id" . "74931")
+("land-lieferant" . "<%elsterland%>")
+("name-lieferant" . "<%company%>")
+("berufsbez" . "")
+("strasse-lieferant" . "<%co_street%>")
+("plz-lieferant" . "<%co_zip%> ")
+("ort-lieferant" . "<%co_city%>")
+("vorwahl" . "<%co_phone_prefix%>")
+("anschluss" . "<%co_phone%>")
+("land" . "<%taxbird_land_nr%>")
+("zeitraum" . "<%taxbird_period%>")
+("stnr" . "<%taxbird_steuernummer%>")
+
+<%foreach id%>
+("<%id%>" . "<%amount%>")<%end%>
+))
\ No newline at end of file
diff --git a/templates/mastertemplates/German/ustva-2004.tex b/templates/mastertemplates/German/ustva-2004.tex
new file mode 100644
index 000000000..fb4b40c78
--- /dev/null
+++ b/templates/mastertemplates/German/ustva-2004.tex
@@ -0,0 +1,121 @@
+% German USTVA template for taxreports
+%
+% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
+%
+%
+\documentclass[twoside]{scrartcl}
+\usepackage{a4,german}
+\usepackage[frame]{xy}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{times, german}
+\usepackage{german}
+\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
+\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{0cm}
+\setlength{\evensidemargin}{0cm}
+\setlength{\textwidth}{20.9cm}
+\setlength{\textheight}{29.6cm}
+\setlength{\footskip}{-0cm}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\fontfamily{cmss}\fontshape{n}\large\selectfont
+\pagestyle{myheadings}
+\markboth{\hspace{7mm}\protect\includegraphics[viewport = 60 700 700 790]{ustva-2004-2.pdf}}
+{\protect\includegraphics[viewport = 60 700 700 790]{ustva-2004-1.pdf}}
+\hspace{1mm}
+\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
+\multicolumn{7}{c}{}\\[-2mm]
+ &  \multicolumn{6}{l}{<%steuernummer%>}\\
+\multicolumn{7}{c}{}\\[15mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
+\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & & &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{
+<%if tel%>
+\small{Tel: <%tel%>}~--~
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%end fax%>
+}& & & &<%FA_10%> &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
+\end{tabular}\\[28.5mm]
+\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
+&&&&\\[22mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[14.5mm]
+\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[46mm]
+\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[7.9mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[14mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
+%\multicolumn{2}{||r|}{1000} & & & \\
+%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
+%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
+\end{tabular}
+
+\newpage
+
+\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
+\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
+&&&&\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[46mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[7.9mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[39.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[26.5mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
+\end{tabular}\\[35mm]
+<%if FA_steuerberater%>
+\vspace{11mm}
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item <%FA_steuerberater_name%>
+\item <%FA_steuerberater_street%>
+\item <%FA_steuerberater_city%>
+\item Tel:~<%FA_steuerberater_tel%>
+\end{small}\\[15mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+<%if not FA_steuerberater%>
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item ~
+\item ~
+\item ~
+\item ~
+\end{small}\\[26mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+\end{document}
diff --git a/templates/mastertemplates/German/ustva-2005.tex b/templates/mastertemplates/German/ustva-2005.tex
new file mode 100644
index 000000000..30de7cfa9
--- /dev/null
+++ b/templates/mastertemplates/German/ustva-2005.tex
@@ -0,0 +1,118 @@
+% German USTVA template for taxreports
+%
+% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
+%
+%
+\documentclass[twoside]{scrartcl}
+\usepackage{a4,german}
+\usepackage[frame]{xy}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{times, german}
+\usepackage{german}
+\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
+\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{0cm}
+\setlength{\evensidemargin}{0cm}
+\setlength{\textwidth}{20.9cm}
+\setlength{\textheight}{29.6cm}
+\setlength{\footskip}{-0cm}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\fontfamily{cmss}\fontshape{n}\large\selectfont
+\pagestyle{myheadings}
+\markboth{\protect\scalebox{1.06}[1.07]{\protect\includegraphics[viewport = 64 700 700 743]{ustva-2005-2.pdf}}}
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790]{ustva-2005-1.pdf}}}
+\hspace{1mm}
+\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
+\multicolumn{7}{c}{}\\[-2mm]
+ &  \multicolumn{6}{l}{<%steuernummer%>}\\
+\multicolumn{7}{c}{}\\[15mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
+\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & & &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{
+<%if tel%>
+\small{Tel: <%tel%>}~--~
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%end fax%>
+}& & & &<%FA_10%> &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
+\end{tabular}\\[28.5mm]
+\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
+&&&&\\[22.5mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
+\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[39mm]
+\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[7.9mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
+\end{tabular}
+
+\newpage
+
+\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
+\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
+&&&&\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[46mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[7.9mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[40mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[26.5mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
+\end{tabular}\\[35mm]
+<%if FA_steuerberater%>
+\vspace{11mm}
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item <%FA_steuerberater_name%>
+\item <%FA_steuerberater_street%>
+\item <%FA_steuerberater_city%>
+\item Tel:~<%FA_steuerberater_tel%>
+\end{small}\\[15mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+<%if not FA_steuerberater%>
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item ~
+\item ~
+\item ~
+\item ~
+\end{small}\\[26mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+\end{document}
diff --git a/templates/mastertemplates/German/ustva-2006.tex b/templates/mastertemplates/German/ustva-2006.tex
new file mode 100644
index 000000000..7a54edbb6
--- /dev/null
+++ b/templates/mastertemplates/German/ustva-2006.tex
@@ -0,0 +1,118 @@
+% German USTVA template for taxreports
+%
+% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
+%
+%
+\documentclass[twoside]{scrartcl}
+\usepackage{a4,german}
+\usepackage[frame]{xy}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{times, german}
+\usepackage{german}
+\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
+\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{0cm}
+\setlength{\evensidemargin}{0cm}
+\setlength{\textwidth}{20.9cm}
+\setlength{\textheight}{29.6cm}
+\setlength{\footskip}{-0cm}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\fontfamily{cmss}\fontshape{n}\large\selectfont
+\pagestyle{myheadings}
+\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790]{ustva-2006-2.pdf}}}
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790]{ustva-2006-1.pdf}}}
+\hspace{1mm}
+\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
+\multicolumn{7}{c}{}\\[-2mm]
+ &  \multicolumn{6}{l}{<%steuernummer%>}\\
+\multicolumn{7}{c}{}\\[15mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
+\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[3mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{
+<%if tel%>
+\small{Tel: <%tel%>}~--~
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%end fax%>
+}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
+\end{tabular}\\[29.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[24.5mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
+\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[42mm]
+\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
+\end{tabular}
+
+\newpage
+
+\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
+\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
+&&&&\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.9mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[42mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
+\end{tabular}\\[35mm]
+<%if FA_steuerberater%>
+\vspace{11mm}
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item <%FA_steuerberater_name%>
+\item <%FA_steuerberater_street%>
+\item <%FA_steuerberater_city%>
+\item Tel:~<%FA_steuerberater_tel%>
+\end{small}\\[15mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+<%if not FA_steuerberater%>
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item ~
+\item ~
+\item ~
+\item ~
+\end{small}\\[26mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+\end{document}
diff --git a/templates/mastertemplates/German/ustva-2007.tex b/templates/mastertemplates/German/ustva-2007.tex
new file mode 100644
index 000000000..1965fa133
--- /dev/null
+++ b/templates/mastertemplates/German/ustva-2007.tex
@@ -0,0 +1,122 @@
+% German USTVA template for taxreports
+%
+% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
+%
+%
+\documentclass[twoside]{scrartcl}
+\usepackage{a4,german}
+\usepackage[frame]{xy}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{times, german}
+\usepackage{german}
+\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
+\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{0cm}
+\setlength{\evensidemargin}{0cm}
+\setlength{\textwidth}{20.9cm}
+\setlength{\textheight}{29.6cm}
+\setlength{\footskip}{-0cm}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\fontfamily{cmss}\fontshape{n}\large\selectfont
+\pagestyle{myheadings}
+\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790]{ustva-2007-2.pdf}}}
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790]{ustva-2007-1.pdf}}}
+\hspace{1mm}
+\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
+\multicolumn{7}{c}{}\\[-2mm]
+ &  \multicolumn{6}{l}{<%steuernummer%>}\\
+\multicolumn{7}{c}{}\\[15mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
+\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[3mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
+
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{}}& & & & &\\[-1mm]
+\end{tabular}\\[29.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[20.5mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.5mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[42mm]
+\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
+\end{tabular}
+
+\newpage
+
+\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
+\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
+&&&&\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.9mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[42mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
+\end{tabular}\\[35mm]
+<%if FA_steuerberater%>
+\vspace{11mm}
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item <%FA_steuerberater_name%>
+\item <%FA_steuerberater_street%>
+\item <%FA_steuerberater_city%>
+\item Tel:~<%FA_steuerberater_tel%>
+\end{small}\\[15mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+<%if not FA_steuerberater%>
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item ~
+\item ~
+\item ~
+\item ~
+\end{small}\\[26mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+\end{document}
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/mastertemplates/German/ustva-2008.tex b/templates/mastertemplates/German/ustva-2008.tex
new file mode 100644
index 000000000..2a50d361a
--- /dev/null
+++ b/templates/mastertemplates/German/ustva-2008.tex
@@ -0,0 +1,127 @@
+% German USTVA template for taxreports
+% Contributed by Jacky und Stefan Tenne 
+% Based on template by Jens Koerner, Peter Schorer, Udo Spallek
+%
+%
+\documentclass[twoside]{scrartcl}
+\usepackage{a4,german}
+\usepackage[frame]{xy}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{times, german}
+\usepackage{german}
+\setlength{\voffset}{-0.7cm} %hier wird die Höhenverschiebung getÀtigt
+\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{0cm}
+\setlength{\evensidemargin}{0cm}
+\setlength{\textwidth}{20.9cm}
+\setlength{\textheight}{29.6cm}
+\setlength{\footskip}{-0cm}
+\setlength{\parindent}{1mm}
+
+\begin{document}
+
+\fontfamily{cmss}\fontshape{n}\large\selectfont
+\pagestyle{myheadings}
+\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790,page=2]{ustva-2008.pdf}}}%Seite 2
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2008.pdf}}}%Seite 1
+\hspace{1mm}
+\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
+\multicolumn{7}{c}{}\\[-2mm]
+ &  \multicolumn{6}{l}{<%steuernummer%>}\\
+\multicolumn{7}{c}{}\\[15mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
+\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[3mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{
+<%if tel%>
+\small{Tel: <%tel%>}~--~
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%end fax%>
+}& & & & &\\[1.8mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
+\end{tabular}\\[29.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[15.6mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[8.5mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[41.7mm]
+\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28.5mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
+\end{tabular}
+\newpage
+
+\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
+\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
+&&&&\\[0.75mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48.3mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.4mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[41.7mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28.4mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[25.6mm]
+\end{tabular}\\[35mm]
+<%if FA_steuerberater%>
+\vspace{11mm}
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item <%FA_steuerberater_name%>
+\item <%FA_steuerberater_street%>
+\item <%FA_steuerberater_city%>
+\item Tel:~<%FA_steuerberater_tel%>
+\end{small}\\[15mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+<%if not FA_steuerberater%>
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item ~
+\item ~
+\item ~
+\item ~
+\end{small}\\[26mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+\end{document}
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/mastertemplates/German/ustva.html b/templates/mastertemplates/German/ustva.html
new file mode 100644
index 000000000..1f5da1ae7
--- /dev/null
+++ b/templates/mastertemplates/German/ustva.html
@@ -0,0 +1,436 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=utf-8" http-equiv="content-type">
+  <title>Vorschau: UStVa</title>
+<!--
+Optik an Formulare angepasst: Hartmut Goebel <h.goebel@goebel-consult.de>
+Variablen hinzugefügt: Udo Spallek <udono@gmx.net>
+Text-Erklärung und unterschiedliche Zeilenfärbung ergänzt: Kai-Martin Knaak <kmk@familieknaak.de>
+-->
+  <style>
+table {
+	text-align: right;
+	border:0;
+	border-collapse:collapse;
+}
+td {
+	font-size:100%;
+	vertical-align:top;
+}
+td.text {
+	text-align: left;
+	background-color:#BDBEBD;
+}
+td.text2 {
+	text-align: left;
+	background-color:#ADBEBD;
+}
+td.spalte,
+td.zeile,
+td.betrag {
+	border:solid thin black;
+}
+td.spalte { font-weight:bold; font-size:120%; }
+td.zeile  { font-weight:bold; }
+td.betrag { width:10em; }
+td.summe  { border:solid medium black; }
+td.spacer { border:0 }
+
+tr.uebertrag td { border-top:solid medium black; }
+b.h3 { font-size:120%; }
+.ausfuellen { background-color:#FFFFC0; }
+.nodis { display:none; }
+  </style>
+</head>
+<body>
+<h1>Vorschau Umsatzsteuer-Voranmeldung</h1>
+<h2>Zeitraum vom <%fromdate%> bis <%todate%> </h2>
+
+<!-- Diese HTML-Formular ist nicht selbstrechnend.
+<p><small>Wenn ein (selbstrechnendes) Formular verwendet wird, genügt es, die
+gelb hinterlegten Felder auszufüllen. Die anderen Felder werden dann
+automatisch berechnet.</small></p>
+-->
+
+<table width="100%">
+<tr align="left">
+  <td class="text">Steuernummer: <%steuernummer%></td>
+  <td class="text" width="100px">&nbsp</td>
+  <td class="text" align="right">Datum (<%Datum_heute%>)</td>
+</tr>
+<tr>
+  <td class="text" colspan="3"><br /></td>
+</tr>
+<tr align="left">
+  <td class="text">
+    Finanzamt <%FA_Name%><br />
+    <%FA_Strasse%><br />
+    <%FA_PLZ%> <%FA_Ort%><br />
+    Fax: <%FA_FAX%>
+  </td>
+  <td class="text">&nbsp;</td>
+  <td class="text">
+    Firma <%company%><br />
+    <%if company_street%>
+      <%company_street%><br />
+      <%company_city%><br />
+    <%end company_street%>
+    <%if not company_street%>
+    <%address%><!--used Address-->
+    <%end company_street%>
+  </td>
+</tr>
+<tr>
+  <td class="text" colspan="3"><br />
+  </td>
+</tr>
+</table>
+<table border="0" cellspacing="2" cellpadding="2">
+  <tbody>
+    <tr>
+      <td class="text"><b class="h3">I. Anmeldung der
+Umsatzsteuer-Vorauszahlung </b></td>
+      <td colspan="4"></td>
+    </tr>
+    <tr>
+      <td class="text"><b class="h4">Lieferungen und sonstige Leistungen</b></td>
+      <td colspan="4"></td>
+    </tr>
+        <tr>
+      <td class="text2">an innergemeinschaftliche Abnehmer <b>mit</b> USt-IdNr</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>41<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%41%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text">neuer Fahrzeuge an Abnehmer <b>ohne</b> USt-IdNr</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>44<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%44%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text2">neuer Fahrzeuge au&szlig;erhalb eines Unternehmens</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>49<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%49%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text">Weitere steuerfreie Ums&auml;tze mit Vorsteuerabzug</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>43<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%43%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text2">Steuerfreie Ums&auml;tze ohne
+Vorsteuerabzug. </b><br />Ums&auml;tze nach &sect; 4 Nr. 8 bis 20 UStG</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>48<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%48%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+
+    <tr>
+      <td class="text"><b class="h4">Steuerpflichtige Ums&auml;tze</b></td>
+      <td colspan="4"></td>
+    </tr>
+<%if not year2007%>
+    <tr>
+      <td class="text2">zum Steuersatz von 16 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>51<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%51%><br></td>
+      <td class="spalte"><span class="nodis">(Spalte 51 rechts)</span></td>
+      <td class="betrag"><%511%></td>
+    </tr>
+<%end year2007%>
+<%if year2007%>
+    <tr>
+      <td class="text2">zum Steuersatz von 19 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>81<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%81%><br></td>
+      <td class="spalte"><span class="nodis">(Spalte 81 rechts)</span></td>
+      <td class="betrag"><%811%></td>
+    </tr>
+<%end year2007%>
+
+    <tr>
+      <td class="text">zum Steuersatz von 7 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%86%></td>
+      <td class="spalte"><span class="nodis">(Spalte 86 rechts)</span></td>
+      <td class="betrag"><%861%></td>
+    </tr>
+    <tr>
+      <td class="text2">andere Steuers&auml;tze</td>
+      <td class="spalte ausfuellen"><span class="nodis"></span>35 <span class="nodis"></span></td>
+      <td class="betrag ausfuellen"><%35%></td>
+      <td class="spalte">36</td>
+      <td class="betrag ausfuellen"><%36%></td>
+    </tr>
+    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
+   <tr>
+      <td class="text">Lieferungen in das &uuml;brige Gemeinschaftsgebiet <b>mit</b> USt-IdNr</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>77<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%77%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text2">Ums&auml;tze, nach &sect;24 UStG (S&auml;gewerkserzeugnisse, alkoholische Getr&auml;nke etc.)</td>
+      <td class="spalte ausfuellen"><span class="nodis"></span>76 <span class="nodis"></span></td>
+      <td class="betrag ausfuellen"><%76%></td>
+      <td class="spalte">80</td>
+      <td class="betrag ausfuellen"><%80%></td>
+    </tr>
+    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
+    <tr>
+      <td class="text"><b class="h3">Innergemeinschaftliche Erwerbe</b></td>
+      <td colspan="4"></td>
+    </tr>
+   <tr>
+      <td class="text2">Steuerfrei nach &sect;4b UStG</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>91<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%91%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+<%if not year2007%>
+    <tr>
+      <td class="text">Steuerpflichtige zum Steuersatz von 16 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>97<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%97%><br></td>
+      <td class="spalte"><span class="nodis">(Spalte 97 rechts)</span></td>
+      <td class="betrag"><%971%></td>
+    </tr>
+<%end if year2007%>
+<%if year2007%>
+    <tr>
+      <td class="text">Steuerpflichtige zum Steuersatz von 19 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>89<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%89%><br></td>
+      <td class="spalte"><span class="nodis">(Spalte 89 rechts)</span></td>
+      <td class="betrag"><%891%></td>
+    </tr>
+<%end if year2007%>
+    <tr>
+      <td class="text2">zum Steuersatz von 7 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>93<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%93%></td>
+      <td class="spalte"><span class="nodis">(Spalte 93 rechts)</span></td>
+      <td class="betrag"><%931%></td>
+    </tr>
+    <tr>
+      <td class="text">zu anderen Steuers&auml;tzen</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>95<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%95%></td>
+      <td class="spalte">98</td>
+      <td class="betrag"><%98%></td>
+    </tr>
+    <tr>
+      <td class="text2"><b class="h4">neuer Fahrzeuge von Lieferern</b>
+             von Lieferanten <b>ohne</b> USt.IdNr. <br class="nodis" />
+	     zum allgemeinen Steuersatz</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>94<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%94%></td>
+      <td class="spalte"><span class="nodis">(Spalte </span>96<span class="nodis">)</span></td>
+      <td class="betrag"><%96%></td>
+    </tr>
+        <tr><td class="text">&nbsp;</td><td colspan="4"></td></tr>
+   <tr>
+      <td class="text">Lieferungen des ersten Abnehmers bei
+        innergemeinschaftlichen Dreiecksgeschften (&sect;25b Abs. 2 UStG)</td>
+      <td class="spalte ausfuellen">42</td>
+      <td class="betrag ausfuellen" width="70"><%42%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+   <tr>
+      <td class="text2">Steuerpflichtige Umstze im Sinne, f&uuml;r die der
+        <b>Leistungsempf&auml;nger die Steuer schuldet</b></td>
+      <td class="spalte ausfuellen">60</td>
+      <td class="betrag ausfuellen" width="70"><%60%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+<%if year2010%>
+   <tr>
+      <td class="text2"><b>Nicht steuerbare Leistungen</b> gem. &sect; 18b Satz 1 Nr. 2 UStG</td>
+      <td class="spalte ausfuellen">21</td>
+      <td class="betrag ausfuellen" width="70"><%21%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+<%end if year2010%>
+   <tr>
+      <td class="text">Im Inland nicht steuerbare Ums&auml;tze</td>
+      <td class="spalte ausfuellen">45</td>
+      <td class="betrag ausfuellen" width="70"><%45%><br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+
+    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="2"></td><td colspan="2"></td></tr>
+
+    <tr>
+      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 43<span class="nodis">)</span></td>
+      <td class="betrag"><%Z43%></td>
+    </tr>
+
+    <tr class="uebertrag">
+      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 45<span class="nodis">)</span></td>
+      <td class="betrag"><%Z45%></td>
+    </tr>
+
+<%if year2010%>
+    <tr>
+      <td class="text2">Im Inland steuerpflichtige sonstige Leistungen von im &uuml;brigen Gemeinschaftsgebiet ans&auml;ssigen Unternehmen (&sect;13b Abs. 1 UStG)</td>
+      <td class="spalte ausfuellen">46</td>
+      <td class="betrag ausfuellen"><%46%></td>
+      <td class="spalte">47</td>
+      <td class="betrag"><%47%></td>
+    </tr>
+<%end if year2010%>
+    <tr>
+      <td class="text2">Leistungen eines im Ausland ans&auml;ssigen Unternehmers</td>
+      <td class="spalte ausfuellen">52</td>
+      <td class="betrag ausfuellen"><%52%></td>
+      <td class="spalte">53</td>
+      <td class="betrag"><%53%></td>
+    </tr>
+    <tr>
+      <td class="text">Lieferungen sicherungsbereigneter Gegenst&auml;nde und
+           Ums&auml;tze, die unter das GrEStG fallen.</td>
+      <td class="spalte ausfuellen">73</td>
+      <td class="betrag ausfuellen"><%73%></td>
+      <td class="spalte">74</td>
+      <td class="betrag"><%74%></td>
+    </tr>
+    <tr>
+      <td class="text2">Bauleistungen eines im Inland ans&auml;ssigen Unternehmers</td>
+      <td class="spalte ausfuellen">84</td>
+      <td class="betrag ausfuellen"><%84%></td>
+      <td class="spalte">85</td>
+      <td class="betrag"><%85%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Steuer wegen Wechsel der Besteuerungsform und
+         Nachsteuer auf versteuerte Anzahlungen wegen Steuersatzerh&ouml;hung.</td>
+      <td class="spalte ausfuellen">65</td>
+      <td class="betrag ausfuellen"><%65%></td>
+    </tr>
+
+
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
+
+    <tr>
+      <td class="text2" colspan="3"><b class="h3">Umsatzsteuer</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 53<span class="nodis">)</span></td>
+      <td class="betrag"><%Z53%></td>
+    </tr>
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
+
+    <tr>
+      <td class="text" colspan="3"><b class="h3">Abziehbare Vorsteuerbetr&auml;ge</b></td>
+      <td colspan="2"></td></tr>
+    </tr>
+
+    <tr>
+      <td class="text2" colspan="3">Vorsteuerbetr&auml;ge von Rechnungen von anderen Unternehmern</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>66<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%66%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Vorsteuerbetr&auml;ge aus dem innergemeinschaftlichen Erwerb</td>
+      <td class="spalte ausfuellen">61</td>
+      <td class="betrag ausfuellen"><%61%></td>
+    </tr>
+    <tr>
+      <td class="text2" colspan="3">Entrichtete Einfuhrumsatzsteuer</td>
+      <td class="spalte ausfuellen">62</td>
+      <td class="betrag ausfuellen"><%62%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Vorsteuerbetr&auml;ge aus Leistungen im Sinne
+          des &sect;13b Abs. 1 UStG</td>
+      <td class="spalte ausfuellen">67</td>
+      <td class="betrag ausfuellen"><%67%></td>
+    </tr>
+    <tr>
+      <td class="text2" colspan="3">Vorsteuerbetr&auml;ge, die nach allgemeinen
+           Durchschnitts&auml;stzen berechnet sind </td>
+      <td class="spalte ausfuellen">63</td>
+      <td class="betrag ausfuellen"><%63%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Berichtigung des Vorsteuerabzugs</td>
+      <td class="spalte ausfuellen">64</td>
+      <td class="betrag ausfuellen"><%64%></td>
+    </tr>
+    <tr>
+      <td class="text2" colspan="3">Vorsteuerabzug f&uuml;r innergemeinschaftliche Lieferungen
+        neuer Fahrzeuge au&szlig;erhalb eines Unternehmens sowie von Kleinunternehmern</td>
+      <td class="spalte ausfuellen">59</td>
+      <td class="betrag ausfuellen"><%59%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Verbleibender Betrag</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 62<span class="nodis">)</span></td>
+      <td class="betrag"><%Z62%></td>
+    </tr>
+
+    <tr>
+      <td class="text2" colspan="3"><b class="h3">Andere Steuerbetr&auml;ge</b></td>
+      <td colspan="2"></td></tr>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">in Rechnungen unrichtig oder unberechtigt ausgewiesene
+        Steuerbetr&auml;ge sowie Steuerbetr&auml;ge, die nach
+        &sect;4 Nr. 4a, &sect; 6a Abs. 4, &sect;7 oder &sect;25b UStG geschuldet werden</td>
+      <td class="spalte ausfuellen">69</td>
+      <td class="betrag ausfuellen"><%69%></td>
+    </tr>
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
+
+    <tr>
+      <td class="text2" colspan="3"><b class="h3">Umsatzsteuer-Vorauszahlung/&Uuml;berschuss</b></td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 65<span class="nodis">)</span></td>
+      <td class="betrag"><%Z65%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Anrechnung (Abzug) der festgesetzten Sondervorauszahlung
+        f&uuml;r Dauerfristverl&auml;ngerung (nur in der letzten Voranmeldung des
+        Besteuerungszeitraums, ausf&uuml;llen)</td>
+      <td class="spalte ausfuellen">39</td>
+      <td class="betrag ausfuellen"><%39%></td>
+    </tr>
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
+
+    <tr class="noborder">
+      <td class="text2" colspan="3"><b class="h3">Verbleibende Umsatzsteuer-Vorauszahlung bzw.
+                                      Verbleibender &Uuml;berschuss</b></td>
+      <td class="spalte ausfuellen">83</td>
+      <td class="summe"><%83%></td>
+    </tr>
+
+  </tbody>
+</table>
+<%if FA_steuerberater%>
+<p>
+Steuerberater:<br />
+<%FA_steuerberater_name%><br />
+<%FA_steuerberater_street%><br />
+<%FA_steuerberater_city%><br />
+Tel:&nbsp;<%FA_steuerberater_tel%></p>
+<%end FA_steuerberater%>
+</body>
+</html>
diff --git a/templates/mastertemplates/German/ustva.tex b/templates/mastertemplates/German/ustva.tex
new file mode 100644
index 000000000..da26f47a8
--- /dev/null
+++ b/templates/mastertemplates/German/ustva.tex
@@ -0,0 +1,120 @@
+% German USTVA template for taxreports
+%
+% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
+%
+%
+\documentclass[twoside]{scrartcl}
+\usepackage{a4,german}
+\usepackage[frame]{xy}
+\usepackage[utf8]{inputenc}
+\usepackage[german]{babel}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{times, german}
+\usepackage{german}
+\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÀtigt
+\setlength{\hoffset}{-1cm}  %und hier die Verschiebung seitwÀrts
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{0cm}
+\setlength{\evensidemargin}{0cm}
+\setlength{\textwidth}{20.9cm}
+\setlength{\textheight}{29.6cm}
+\setlength{\footskip}{-0cm}
+\setlength{\parindent}{0pt}
+
+\begin{document}
+
+\fontfamily{cmss}\fontshape{n}\large\selectfont
+\pagestyle{myheadings}
+\markboth{\hspace{7mm}\protect\includegraphics[viewport = 60 700 700 790]{ustva2.pdf}}
+{\protect\includegraphics[viewport = 60 700 700 790]{ustva1.pdf}}
+\hspace{1mm}
+\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
+\multicolumn{7}{c}{}\\[-2mm]
+ &  \multicolumn{6}{l}{<%steuernummer%>}\\
+\multicolumn{7}{c}{}\\[15mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
+\multicolumn{2}{p{7.5cm}}{}  & & & & &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company_street%>}}& & & & &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%company_city%>}}& & & & &\\[1mm]
+\multicolumn{2}{p{7.5cm}}{
+<%if tel%>
+\small{Tel: <%tel%>}~--~
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%end fax%>
+}& & & &<%FA_10%> &\\[-1mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
+\end{tabular}\\[28.5mm]
+\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
+&&&&\\[42mm]
+\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[46mm]
+\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[7.9mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[14mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\
+%\multicolumn{2}{||r|}{1000} & & & \\
+%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
+%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
+\end{tabular}
+
+\newpage
+
+\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
+\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
+&&&&\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%45%>}\\[46mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[7.9mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[7.9mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[58.5mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
+\end{tabular}\\[35mm]
+<%if FA_steuerberater%>
+\vspace{11mm}
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item <%FA_steuerberater_name%>
+\item <%FA_steuerberater_street%>
+\item <%FA_steuerberater_city%>
+\item Tel:~<%FA_steuerberater_tel%>
+\end{small}\\[15mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+<%if not FA_steuerberater%>
+\begin{list}{}{
+\setlength{\leftmargin}{2mm}
+\setlength{\itemsep}{0mm}
+\setlength{\parsep}{0mm}
+%\setlength{\topsep}{0mm}
+%\setlength{\parskip}{0mm}
+%\setlength{\partopsep}{0mm}
+}
+\begin{small}
+\item ~
+\item ~
+\item ~
+\item ~
+\end{small}\\[26mm]
+\item  <%Datum_heute%>,
+\end{list}
+<%end FA_steuerberater%>
+\end{document}
diff --git a/templates/mastertemplates/German/winston.xml b/templates/mastertemplates/German/winston.xml
new file mode 100644
index 000000000..2bb63da22
--- /dev/null
+++ b/templates/mastertemplates/German/winston.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Diese Datei ist mit Lx-Office <%version%> generiert -->
+<WinstonAusgang>
+  <Formular Typ="UST"></Formular>
+  <Ordnungsnummer><%elsterFFFF%><%elstersteuernummer%></Ordnungsnummer>
+  <AnmeldeJahr><%year%></AnmeldeJahr>
+  <AnmeldeZeitraum><%period%></AnmeldeZeitraum>
+
+<%foreach id%>
+  <Kennzahl nr="<%id%>"><%amount%></Kennzahl>
+<%end%>
+
+</WinstonAusgang>
+
diff --git a/templates/mastertemplates/German/zahlungserinnerung.tex b/templates/mastertemplates/German/zahlungserinnerung.tex
new file mode 100644
index 000000000..679f6bd6e
--- /dev/null
+++ b/templates/mastertemplates/German/zahlungserinnerung.tex
@@ -0,0 +1,62 @@
+\documentclass[10pt, oneside]{scrartcl}
+\usepackage[utf8]{inputenc}
+\usepackage{german}
+\usepackage{tabularx}
+\usepackage{xspace}
+\usepackage{ifthen}
+\usepackage{eso-pic}
+\usepackage{longtable}
+\usepackage{eurosym}
+
+\setlength{\voffset}{-0.3cm}
+\setlength{\hoffset}{-2.2cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{2cm}
+%\setlength{\evensidemargin}{2cm}
+\setlength{\textwidth}{16.4cm}
+% \setlength{\textwidth}{13.4cm}
+\setlength{\textheight}{23.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\setlength{\tabcolsep}{0cm}
+
+\renewcommand{\baselinestretch}{1}
+
+\begin{document}
+\pagestyle{empty}
+\fontfamily{cmss}\fontsize{10pt}{10pt}\fontseries{m}\selectfont
+
+% \vspace*{5cm}
+
+<%name%>
+
+% \ifthenelse{\equal{<%cp_name%>}{}}{}{z.Hd. <%cp_name%>}
+
+<%street%>
+
+<%zipcode%> <%city%>
+
+\begin{flushright}<%dunning_date%>\end{flushright}
+
+\vspace*{2.5cm} %\\
+\large
+\textbf{Zahlungserinnerung} \\ \\ \\
+\normalsize
+Sehr geehrte Damen und Herren, \\ \\ \\
+man kann seine Augen nicht überall haben - offensichtlich haben Sie übersehen, die folgenden Rechnungen zu begleichen: \\
+\vspace{0.5cm} \\
+\begin{tabularx}{\textwidth}{l@{\hspace*{2cm}}X@{\hspace*{0.5cm}}r}
+  \textbf{Rechnungsnummer} & \textbf{Rechnungsdatum} & \textbf{Rechnungsbetrag} \\ \hline && \\
+  <%foreach dn_invnumber%>
+    <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \euro \\[0.1cm]
+  <%end dn_invnumber%>
+\end{tabularx}
+\vspace*{0.5cm} \\
+Wir bitten Sie, diese bis zum <%dunning_duedate%> zu begleichen. \\ \\ \\
+Bitte beachten Sie, dass wir Zahlungseingänge nur bis zum <%dunning_date%> berücksichtigen konnten. Sollten Sie zwischenzeitlich bezahlt haben, betrachten Sie diese Zahlungserinnerung bitte als gegenstandslos. \\ \\ \\
+Mit freundlichen Grüßen, \\ \\ \\ \\
+<%employee_name%>
+\end{document}
diff --git a/templates/mastertemplates/German/zahlungserinnerung_invoice.tex b/templates/mastertemplates/German/zahlungserinnerung_invoice.tex
new file mode 100644
index 000000000..bc5cfa67e
--- /dev/null
+++ b/templates/mastertemplates/German/zahlungserinnerung_invoice.tex
@@ -0,0 +1,75 @@
+\documentclass[10pt, oneside]{scrartcl}
+\usepackage[utf8]{inputenc}
+\usepackage{german}
+\usepackage{tabularx}
+\usepackage{xspace}
+\usepackage{ifthen}
+\usepackage{eso-pic}
+\usepackage{longtable}
+\usepackage{eurosym}
+
+\setlength{\voffset}{-0.3cm}
+\setlength{\hoffset}{-2.2cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{2cm}
+%\setlength{\evensidemargin}{2cm}
+\setlength{\textwidth}{16.4cm}
+% \setlength{\textwidth}{13.4cm}
+\setlength{\textheight}{23.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\setlength{\tabcolsep}{0cm}
+
+\renewcommand{\baselinestretch}{1}
+
+\begin{document}
+\pagestyle{empty}
+\fontfamily{cmss}\fontsize{10pt}{10pt}\fontseries{m}\selectfont
+
+<%name%>
+
+<%street%>
+
+<%zipcode%> <%city%>
+
+\begin{flushright}<%invdate%>\end{flushright}
+
+\vspace*{2.5cm}
+
+\large
+\textbf{Rechnung <%invnumber%>}
+
+\vspace*{1cm}
+
+\normalsize
+Sehr geehrte Damen und Herren,
+
+\vspace*{1cm}
+Hiermit stellen wir Ihnen zu Mahnung <%dunning_id%> die folgenden Posten in Rechnung:
+
+\vspace*{0.5cm}
+
+\begin{tabularx}{\textwidth}{Xr}
+  \textbf{Posten} & \multicolumn{1}{l}{\textbf{Betrag}}\\
+  \hline
+  Mahngebühren & <%fee%> EUR \\
+  Zinsen & <%interest%> EUR \\
+  \cline{2-2}
+  Gesamtsumme & <%invamount%> EUR\\
+\end{tabularx}
+
+\vspace*{0.5cm}
+
+Bitte begleichen Sie diese Forderung bis zum <%duedate%>.
+
+\vspace*{0.5cm}
+
+Mit freundlichen Grüßen,
+
+\vspace*{2cm}
+<%employee_name%>
+
+\end{document}
diff --git a/templates/mastertemplates/Service/balance_sheet.html b/templates/mastertemplates/Service/balance_sheet.html
new file mode 100644
index 000000000..478caabca
--- /dev/null
+++ b/templates/mastertemplates/Service/balance_sheet.html
@@ -0,0 +1,100 @@
+
+<body bgcolor=ffffff>
+
+<h2 align=center>
+<%company%>
+<br><%address%>
+
+<p>BALANCE SHEET
+<br><%period%>
+</h2>
+
+<table border=0>
+<tr>
+  <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach asset_account%>
+<tr>
+  <td> </td>
+  <td><%asset_account%></td>
+  <td align=right><%asset_this_period%></td>
+  <td align=right><%asset_last_period%></td>
+</tr>
+<%end asset_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>TOTAL ASSETS</th>
+  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
+  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
+</tr>
+
+<tr>
+  <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
+</tr>
+
+<%foreach liability_account%>
+<tr>
+  <td></td>
+  <td><%liability_account%></td>
+  <td align=right><%liability_this_period%></td>
+  <td align=right><%liability_last_period%></td>
+</tr>
+<%end liability_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td></td>
+  <th align=left>Total Liabilities</th>
+  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr>
+  <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
+</tr>
+
+<%foreach equity_account%>
+<tr>
+  <td></td>
+  <td><%equity_account%></td>
+  <td align=right><%equity_this_period%></td>
+  <td align=right><%equity_last_period%></td>
+</tr>
+<%end equity_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td></td>
+  <th align=left>Total Equity</th>
+  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
+  <td align=right><%total_this_period%><br><hr noshade size=2></td>
+  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+</tr>
+</table>
+
+
+
diff --git a/templates/mastertemplates/Service/check.tex b/templates/mastertemplates/Service/check.tex
new file mode 100644
index 000000000..4f97660be
--- /dev/null
+++ b/templates/mastertemplates/Service/check.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Invoice No.} & \textbf{Invoice Date}
+  & \textbf{Due} & \textbf{Applied} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/Service/income_statement.html b/templates/mastertemplates/Service/income_statement.html
new file mode 100644
index 000000000..e9d6a4002
--- /dev/null
+++ b/templates/mastertemplates/Service/income_statement.html
@@ -0,0 +1,82 @@
+
+<body bgcolor=ffffff>
+
+<h2 align=center>
+<%company%>
+<br><%address%>
+
+<p>INCOME STATEMENT
+<br><%period%>
+</h2>
+
+
+<table width=100% border=0>
+<tr>
+  <th width=400 align=left colspan=2>INCOME<br><hr width=300 size=5 align=left noshade></th>
+  <th><%this_period%></th>
+  <th><%last_period%></th>
+</tr>
+
+<%foreach income_account%>
+<tr>
+  <td width=4> </td>
+  <td><%income_account%></td>
+  <td align=right><%income_this_period%></td>
+  <td align=right><%income_last_period%></td>
+</tr>
+<%end income_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td> </td>
+  <th align=left>Total Income</th>
+  <td align=right><%total_income_this_period%><hr noshade size=2></td>
+  <td align=right><%total_income_last_period%><hr noshade size=2></td>
+</tr>
+
+<tr>
+  <th align=left colspan=2>EXPENSES<br><hr width=300 size=5 align=left noshade></th>
+</tr>
+
+<%foreach expense_account%>
+<tr>
+  <td> </td>
+  <td><%expense_account%></td>
+  <td align=right><%expenses_this_period%></td>
+  <td align=right><%expenses_last_period%></td>
+</tr>
+<%end expense_account%>
+
+<tr>
+  <td colspan=2> </td>
+  <td><hr noshade size=1></td>
+  <td><hr noshade size=1></td>
+</tr>
+
+<tr valign=top>
+  <td> </td>
+  <th align=left>Total Expenses</th>
+  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
+  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
+</tr>
+
+<tr valign=top>
+  <th align=left colspan=2>INCOME / (LOSS)</th>
+  <td align=right><%total_this_period%><br><hr noshade size=2></td>
+  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+</tr>
+
+</table>
+
+
+
+
+
+
+
+
diff --git a/templates/mastertemplates/Service/invoice.html b/templates/mastertemplates/Service/invoice.html
new file mode 100644
index 000000000..47493edd4
--- /dev/null
+++ b/templates/mastertemplates/Service/invoice.html
@@ -0,0 +1,226 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr>
+  <td width=10>
+  </td> 
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      <br>Tel/Fax <%tel%> / <%fax%>
+      </h4>
+    </td>
+
+    <th colspan=2>
+      <h4 align=center>I N V O I C E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Date</th><td width=10> </td><td><%invdate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Number</th><td></td><td><%invnumber%></td></tr>
+    </tr>
+
+<!-- prepared by: <%username%>
+-->
+
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>To:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+      
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td> 
+    </td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>Description</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+      <td><%description%></td>
+      <td>&nbsp;</td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=3><hr noshade></td>
+    </tr>
+    
+    <tr>
+<%if taxincluded%>
+      <td>&nbsp;</td>
+      <th align=right>Total</th>
+      <td align=right><%invtotal%></td>
+<%end taxincluded%>
+<%if not taxincluded%>
+      <td>&nbsp;</td>
+      <th align=right>Subtotal</th>
+      <td align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=2 align=right><%taxdescription%></th>
+      <td align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+<!--
+  <%taxbase%> = total netamount for each tax bracket
+  <%taxrate%> = taxrate in percent
+-->
+     
+<%if paid%>
+    <tr>
+      <td>&nbsp;</td>
+      <th align=right>Paid</th>
+      <td align=right><%paid%></td>
+    </tr>
+<%end paid%>
+
+    <tr>
+      <td>&nbsp;</td>
+      <td colspan=2><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td>
+<%if terms%>
+Terms &nbsp;Net <b><%terms%></b> days
+<%end terms%>
+</td>
+      <th align=right>Total</th>
+      <th align=right><%total%></th>
+    </tr>
+    
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<%if notes%>
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+      <td>Notes</td>
+      <td><pre><%notes%></pre></td>
+      <td align=right>
+      &nbsp;
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+<%end notes%>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <th colspan=3>
+  Please make check payable to <%company%>
+  <br>Thank you for your valued business!
+  </th>
+</tr>
+
+
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Payment due NET <%terms%> Days from date of Invoice.
+    Interest on overdue amounts will acrue at the rate of 1.5% per month
+    from due date until paid in full.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=3 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
+    </tr>
+<%end tax%>
+
+<!--
+  %username% = user name
+  %businessnumber% = business number
+-->
+
+<!-- banking information
+    <tr>
+      <th colspan=3 align=left><font size=-2>Banking Information:
+      <br>Bank
+      <br>Transit No.
+      <br>Account No.
+      </th>
+    </tr>
+-->
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Service/invoice.tex b/templates/mastertemplates/Service/invoice.tex
new file mode 100644
index 000000000..3ea270332
--- /dev/null
+++ b/templates/mastertemplates/Service/invoice.tex
@@ -0,0 +1,151 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Telephone & <%tel%>\\
+    Facsimile & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
+
+\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 <%invnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{I N V O I C E}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date} & <%invdate%> \\
+  \textbf{Number} & <%invnumber%> \\
+  \textbf{Customer} & <%customer_id%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+<%foreach number%>
+  <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%> \\
+<%end tax%>
+<%if paid%>
+  \textbf{Paid} & - <%paid%> \\
+<%end paid%>
+  \hline
+  \textbf{Balance Owing} & \textbf{<%total%>} \\
+
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>} funds.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+\vfill
+\centerline{\textbf{Thank You for your valued business!}}
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\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.
+}
+
+\end{document}
+
+
diff --git a/templates/mastertemplates/Service/purchase_order.html b/templates/mastertemplates/Service/purchase_order.html
new file mode 100644
index 000000000..30d752193
--- /dev/null
+++ b/templates/mastertemplates/Service/purchase_order.html
@@ -0,0 +1,194 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telephone: <%tel%>
+      <br>Facsimile: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>P U R C H A S E &nbsp;&nbsp; O R D E R</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>To:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Number</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qt'y</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Price</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=6><hr noshade></td>
+    </tr>
+    
+    <tr>
+      <th colspan=4 align=right>Subtotal</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=2>Terms Net <b><%terms%></b> days</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Notes</td>
+      <td><pre><%notes%></pre></td>
+<%end notes%>
+      <td align=right>
+      All prices in <b><%currency%></b> Funds
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Payment due NET <%terms%> Days from date of Invoice.
+    Interest on overdue amounts will acrue at the rate of 1.5% per month
+    from due date 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.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Service/purchase_order.tex b/templates/mastertemplates/Service/purchase_order.tex
new file mode 100644
index 000000000..34e63523a
--- /dev/null
+++ b/templates/mastertemplates/Service/purchase_order.tex
@@ -0,0 +1,143 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Telephone & <%tel%>\\
+    Facsimile & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
+
+\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 <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{P U R C H A S E} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Required by} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Number} & <%ordnumber%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+<%foreach number%>
+  <%number%> & <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%ordtotal%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>} funds.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+
+%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+%\footnotetext[1]{\tiny }
+
+\end{document}
+
+
diff --git a/templates/mastertemplates/Service/receipt.tex b/templates/mastertemplates/Service/receipt.tex
new file mode 100644
index 000000000..4f97660be
--- /dev/null
+++ b/templates/mastertemplates/Service/receipt.tex
@@ -0,0 +1,71 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.4cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.0cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+
+\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
+
+\parbox[t]{12cm}{
+  <%company%>
+
+  <%address%>}
+\hfill
+\parbox[t]{6cm}{\hfill <%source%>}
+
+\vspace*{0.6cm}
+
+<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+
+\vspace{0.5cm}
+
+\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+
+\vspace{0.5cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{2.8cm}
+
+<%company%>
+
+\vspace{0.5cm}
+
+<%name%> \hfill <%datepaid%> \hfill <%source%>
+
+\vspace{0.5cm}
+\begin{tabularx}{\textwidth}{lXrr@{}}
+\textbf{Invoice No.} & \textbf{Invoice Date}
+  & \textbf{Due} & \textbf{Applied} \\
+<%foreach invnumber%>
+<%invnumber%> & <%invdate%> \dotfill
+  & <%due%> & <%paid%> \\
+<%end invnumber%>
+\end{tabularx}
+
+\vfill
+
+\end{document}
+
diff --git a/templates/mastertemplates/Service/sales_order.html b/templates/mastertemplates/Service/sales_order.html
new file mode 100644
index 000000000..0a2ffe84f
--- /dev/null
+++ b/templates/mastertemplates/Service/sales_order.html
@@ -0,0 +1,198 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telelephone: <%tel%>
+      <br>Facsimile: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>S A L E S &nbsp;&nbsp; O R D E R</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Order Date</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Required by</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Number</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>To:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<%if contact%>
+      <p>Attn: <%contact%>
+%end contact%>
+
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Number</th>
+      <th align=left><font color=ffffff>Description</th>
+      <th><font color=ffffff>Qt'y</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Price</th>
+      <th><font color=ffffff>Amount</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=6><hr noshade></td>
+    </tr>
+    
+    <tr>
+      <th colspan=4 align=right>Subtotal</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=2>Terms Net <b><%terms%></b> days</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Notes</td>
+      <td><pre><%notes%></pre></td>
+<%end notes%>
+      <td align=right>
+      All prices in <b><%currency%></b> Funds
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Payment due NET <%terms%> Days from date of Invoice.
+    Interest on overdue amounts will acrue at the rate of 1.5% per month
+    from due date 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.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/mastertemplates/Service/sales_order.tex b/templates/mastertemplates/Service/sales_order.tex
new file mode 100644
index 000000000..e036d5341
--- /dev/null
+++ b/templates/mastertemplates/Service/sales_order.tex
@@ -0,0 +1,142 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+      
+      <%address%>}\hfill
+    \begin{tabular}[b]{rr@{}}
+    Telephone & <%tel%>\\
+    Facsimile & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+    
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
+
+\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 <%ordnumber%>}
+
+\vspace*{-12pt}
+
+\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+  & carried forward from <%lastpage%> & & & <%sumcarriedforward%> \\
+<%end pagebreak%>
+
+
+\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+\vspace*{2cm}
+
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+\vspace{3.5cm}
+
+\textbf{S A L E S} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
+\hfill
+\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
+  \textbf{Date} & <%orddate%> \\
+<%if reqdate%>
+  \textbf{Required by} & <%reqdate%> \\
+<%end reqdate%>
+  \textbf{Number} & <%ordnumber%>
+\end{tabular}
+
+\vspace{1cm}
+
+\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
+  \textbf{Description} & \textbf{Qt'y} &
+    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
+<%foreach number%>
+  <%description%> & <%qty%> &
+    <%unit%> & <%sellprice%> & <%linetotal%> \\
+<%end number%>
+\end{tabular*}
+
+
+\parbox{\textwidth}{
+\rule{\textwidth}{2pt}
+
+\vspace{0.2cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Subtotal} & \textbf{<%subtotal%>} \\
+<%foreach tax%>
+  <%taxdescription%> on <%taxbase%> & <%tax%>\\
+<%end tax%>
+  \hline
+  \textbf{Total} & \textbf{<%ordtotal%>}\\
+\end{tabularx}
+
+\vspace{0.3cm}
+
+\hfill
+  All prices in \textbf{<%currency%>} funds.
+
+\vspace{12pt}
+
+<%if notes%>
+  <%notes%>
+<%end if%>
+
+}
+
+
+%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+%\footnotetext[1]{\tiny }
+
+\end{document}
+
diff --git a/templates/mastertemplates/Service/statement.html b/templates/mastertemplates/Service/statement.html
new file mode 100644
index 000000000..441e6e0d1
--- /dev/null
+++ b/templates/mastertemplates/Service/statement.html
@@ -0,0 +1,121 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr>
+	  <td>
+	    <h4>
+	    <%company%>
+	    <br><%address%>
+	    </h4>
+	  </td>
+	  <th><img src=http://www.sql-ledger.org/images/sql-ledger.png border=0 width=64 height=58></th>
+	  <td align=right>
+	  <h4>
+	  Tel: <%tel%>
+	  <br>Fax: <%fax%>
+	  </h4>
+	  </td>
+	</tr>
+	<tr>
+	  <th colspan=3><h4>S T A T E M E N T</h4></th>
+	</tr>
+	<tr>
+	  <td colspan=3 align=right><%statementdate%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+	<tr valign=top>
+	  <td><%name%>
+	  <br><%street%>
+	  <br><%zipcode%>
+	  <br><%city%>
+	  <br><%country%>
+	  <br>
+<%if customerphone%>
+	  <br>Tel: <%customerphone%>
+<%end customerphone%>
+<%if customerfax%>
+	  <br>Fax: <%customerfax%>
+<%end customerfax%>
+<%if email%>
+	  <br><%email%>
+<%end email%>
+	  </td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>
+      <table width=100%>
+        <tr>
+	  <th align=left>Invoice #</th>
+	  <th width=15%>Date</th>
+	  <th width=15%>Due</th>
+	  <th width=10%>Current</th>
+	  <th width=10%>30</th>
+	  <th width=10%>60</th>
+	  <th width=10%>90+</th>
+	</tr>
+<%foreach invnumber%>
+	<tr>
+	  <td><%invnumber%></td>
+	  <td><%invdate%></td>
+	  <td><%duedate%></td>
+	  <td align=right><%c0%></td>
+	  <td align=right><%c30%></td>
+	  <td align=right><%c60%></td>
+	  <td align=right><%c90%></td>
+	</tr>
+<%end invnumber%>
+        <tr>
+	  <td colspan=7><hr size=1></td>
+	</tr>
+	<tr>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <td>&nbsp;</td>
+	  <th align=right><%c0total%></td>
+	  <th align=right><%c30total%></td>
+	  <th align=right><%c60total%></td>
+	  <th align=right><%c90total%></td>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr height=10></tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td align=right>
+      <table width=50%>
+        <tr>
+	  <th>Total Outstanding</th>
+          <th align=right><%total%></th>
+	</tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><hr noshade></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>Please make check payable to <b><%company%></b>.
+    </td>
+  </tr>
+  <tr height=20></tr>
+</table>
+
diff --git a/templates/mastertemplates/Service/statement.tex b/templates/mastertemplates/Service/statement.tex
new file mode 100644
index 000000000..23ebf781e
--- /dev/null
+++ b/templates/mastertemplates/Service/statement.tex
@@ -0,0 +1,137 @@
+\documentclass[twoside]{scrartcl}
+\usepackage[frame]{xy}
+\usepackage{tabularx}
+\usepackage[utf8]{inputenc}
+\setlength{\voffset}{0.5cm}
+\setlength{\hoffset}{-2.0cm}
+\setlength{\topmargin}{0cm}
+\setlength{\headheight}{0.5cm}
+\setlength{\headsep}{1cm}
+\setlength{\topskip}{0pt}
+\setlength{\oddsidemargin}{1.0cm}
+\setlength{\evensidemargin}{1.0cm}
+\setlength{\textwidth}{19.2cm}
+\setlength{\textheight}{24.5cm}
+\setlength{\footskip}{1cm}
+\setlength{\parindent}{0pt}
+\renewcommand{\baselinestretch}{1}
+\begin{document}
+
+\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
+
+\newsavebox{\hdr}
+\sbox{\hdr}{
+  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
+
+  \parbox{\textwidth}{
+    \parbox[b]{12cm}{
+      <%company%>
+
+      <%address%>}\hfill
+    \begin{tabular}[b]{rrr@{}}
+    Tel & <%tel%>\\
+    Fax & <%fax%>
+    \end{tabular}
+
+    \rule[1.5ex]{\textwidth}{0.5pt}
+  }
+}
+
+\fontfamily{cmss}\fontshape{n}\selectfont
+
+\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
+
+\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}
+
+\parbox[t]{1cm}{\hfill}
+\parbox[t]{10.5cm}{
+  
+<%name%>
+
+<%street%>
+
+<%zipcode%>
+
+<%city%>
+
+<%country%>
+
+}
+\parbox[t]{7.5cm}{
+<%if customerphone%>
+Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+Fax: <%customerfax%>
+<%end customerfax%>
+
+<%email%>
+}
+\hfill
+
+\vspace{1cm}
+
+\textbf{S T A T E M E N T} \hfill
+
+\hfill <%statementdate%>
+
+\vspace{2cm}
+
+\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
+  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
+  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
+<%foreach invnumber%>
+  <%invnumber%> & <%invdate%> & <%duedate%> &
+  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
+<%end invnumber%>
+\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
+\end{tabular*}
+\rule{\textwidth}{1pt}
+
+\vspace{1cm}
+
+\hfill
+\begin{tabularx}{7cm}{Xr@{}}
+  \textbf{Total outstanding} & <%total%>
+\end{tabularx}
+
+\vfill
+
+Please make check payable to <%company%>
+
+\renewcommand{\thefootnote}{\fnsymbol{footnote}}
+
+\footnotetext[1]{\tiny
+}
+
+\end{document}
+