Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/AM.pm b/SL/AM.pm
index 67c3c20..59e9c78 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1116,7 +1116,7 @@ sub save_preferences {
 
   $form->{businessnumber} =  $businessnumber;
 
-  $myconfig = new User($form->{login});
+  $myconfig = User->new(login => $form->{login});
 
   foreach my $item (keys %$form) {
     $myconfig->{$item} = $form->{$item};

diff --git a/SL/CT.pm b/SL/CT.pm
index b46ee09..eece19e 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -868,6 +868,9 @@ sub get_contact {
   $main::lxdebug->enter_sub();
 
   my ( $self, $myconfig, $form ) = @_;
+
+  die 'Missing argument: cp_id' unless $::form->{cp_id};
+
   my $dbh   = $form->dbconnect($myconfig);
   my $query =
     qq|SELECT * FROM contacts c | .
@@ -1047,6 +1050,7 @@ sub _delete_selected_notes {
   $main::lxdebug->leave_sub();
 }
 
+# TODO: remove in 2.7.0 stable
 sub delete_shipto {
   $main::lxdebug->enter_sub();
 
@@ -1064,6 +1068,7 @@ sub delete_shipto {
   $main::lxdebug->leave_sub();
 }
 
+# TODO: remove in 2.7.0 stable
 sub delete_contact {
   $main::lxdebug->enter_sub();
 

diff --git a/SL/DB/Contact.pm b/SL/DB/Contact.pm
index 4b6c35e..d891f07 100644 (file)
--- a/SL/DB/Contact.pm
+++ b/SL/DB/Contact.pm
@@ -32,7 +32,7 @@ sub used {
 
 sub detach {
   $_[0]->cp_cv_id(undef);
-  $_[0]->save;
+  $_[0];
 }
 
 sub full_name {

diff --git a/SL/DB/Shipto.pm b/SL/DB/Shipto.pm
index eba1b6a..2492ac7 100644 (file)
--- a/SL/DB/Shipto.pm
+++ b/SL/DB/Shipto.pm
@@ -19,4 +19,23 @@ sub displayable_id {
   return $text;
 }
 
+sub used {
+  my ($self) = @_;
+
+  return unless $self->shipto_id;
+
+  require SL::DB::Order;
+  require SL::DB::Invoice;
+  require SL::DB::DeliveryOrder;
+
+  return SL::DB::Manager::Order->get_all_count(query => [ shipto_id => $self->shipto_id ])
+      || SL::DB::Manager::Invoice->get_all_count(query => [ shipto_id => $self->shipto_id ])
+      || SL::DB::Manager::DeliveryOrder->get_all_count(query => [ shipto_id => $self->shipto_id ]);
+}
+
+sub detach {
+  $_[0]->trans_id(undef);
+  $_[0];
+}
+
 1;

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 75fb790..3254b9b 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -476,7 +476,7 @@ sub save_user {
   $user->{templates} =~ s|.*/||;
   $user->{templates} =  $::lx_office_conf{paths}->{templates} . "/$user->{templates}";
 
-  my $myconfig = new User(id => $form->{id});
+  my $myconfig = new User(id => $user->{id});
 
   $::form->show_generic_error($::locale->text('Dataset missing!'))       unless $user->{dbname};
   $::form->show_generic_error($::locale->text('Database User missing!')) unless $user->{dbuser};

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 2eb6c24..9e814e1 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -711,41 +711,53 @@ sub get_delivery {
 }
 
 sub delete_shipto {
-  $main::lxdebug->enter_sub();
+  $::lxdebug->enter_sub;
+  $::auth->assert('customer_vendor_edit');
 
-  $main::auth->assert('customer_vendor_edit');
+  if (!$::form->{shipto_id}) {
+    flash('error', $::locale->text('No shipto selected to delete'));
+  } else {
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
+    CT->get_shipto(\%::myconfig, $::form);
 
-  CT->get_shipto(\%myconfig, \%$form);
+    my $shipto = SL::DB::Manager::Shipto->find_by(shipto_id => $::form->{shipto_id});
 
-  unless ($form->{shiptoused}) {
-    CT->delete_shipto($form->{shipto_id});
-    @$form{ grep /^shipto/, keys %$form } = undef;
+    if ($shipto->used) {
+      $shipto->detach->save;
+      flash('info', $::locale->text('Shipto is in use and was flagged invalid.'));
+    } else {
+      $shipto->delete;
+      flash('info', $::locale->text('Shipto deleted.'));
+    }
+    delete $::form->{$_} for grep /^shipto/, keys %$::form;
   }
 
   edit();
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub delete_contact {
   $::lxdebug->enter_sub;
   $::auth->assert('customer_vendor_edit');
 
-  CT->get_contact(\%::myconfig, $::form);
+  if (!$::form->{cp_id}) {
+    flash('error', $::locale->text('No contact selected to delete'));
+  } else {
+
+    CT->get_contact(\%::myconfig, $::form);
 
-  my $contact = SL::DB::Manager::Contact->find_by(cp_id => $::form->{cp_id});
+    my $contact = SL::DB::Manager::Contact->find_by(cp_id => $::form->{cp_id});
 
-  if ($contact->used) {
-    $contact->detach;
-    flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
-  } else {
-    $contact->delete;
-    flash('info', $::locale->text('Contact deleted.'));
+    if ($contact->used) {
+      $contact->detach->save;
+      flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
+    } else {
+      $contact->delete;
+      flash('info', $::locale->text('Contact deleted.'));
+    }
+    delete $::form->{$_} for grep /^cp_/, keys %$::form;
   }
-  delete $::form->{$_} for grep /^cp_/, keys %$::form;
 
   edit();
 

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index e16286d..ccc5f2b 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -266,8 +266,7 @@ sub form_header {
           if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
 
   my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
-  $form->get_lists("shipto"         => "ALL_SHIPTO",
-                   "projects"       => {
+  $form->get_lists("projects"       => {
                      "key"          => "ALL_PROJECTS",
                      "all"          => 0,
                      "old_id"       => \@old_project_ids
@@ -280,6 +279,9 @@ sub form_header {
 
   $::form->{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
   $::form->{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
+  $::form->{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all(query => [
+    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, shipto_id => $::form->{shipto_id} * 1 ]
+  ]);
   $::form->{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all(query => [
     or => [
       cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index cd4591d..7d5c36a 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -283,8 +283,7 @@ sub form_header {
   my @old_project_ids = ($form->{"globalproject_id"});
   map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"};
 
-  $form->get_lists("shipto"        => "ALL_SHIPTO",
-                   "projects"      => { "key"    => "ALL_PROJECTS",
+  $form->get_lists("projects"      => { "key"    => "ALL_PROJECTS",
                                         "all"    => 0,
                                         "old_id" => \@old_project_ids },
                    "taxzones"      => "ALL_TAXZONES",

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 6f433a9..9c6cd67 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -300,8 +300,7 @@ sub form_header {
   my @old_project_ids = ($form->{"globalproject_id"});
   map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"};
 
-  $form->get_lists("shipto"        => "ALL_SHIPTO",
-                   "projects"      => { "key"    => "ALL_PROJECTS",
+  $form->get_lists("projects"      => { "key"    => "ALL_PROJECTS",
                                         "all"    => 0,
                                         "old_id" => \@old_project_ids },
                    "taxzones"      => "ALL_TAXZONES",
@@ -312,6 +311,9 @@ sub form_header {
 
   $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
   $TMPL_VAR{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
+  $TMPL_VAR{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all(query => [
+    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, shipto_id => $::form->{shipto_id} * 1 ]
+  ]);
   $TMPL_VAR{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all(query => [
     or => [
       cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
@@ -321,7 +323,6 @@ sub form_header {
       ]
     ]
   ]);
-  $TMPL_VAR{shipto_labels}         = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) };
   $TMPL_VAR{department_labels}     = sub { "$_[0]->{description}--$_[0]->{id}" };
 
   # customer

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 3b62071..39ec0eb 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -327,8 +327,7 @@ sub form_header {
   my @old_project_ids = ($form->{"globalproject_id"}, grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
 
   my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
-  $form->get_lists("shipto"        => "ALL_SHIPTO",
-                   "projects"      => { "key"      => "ALL_PROJECTS",
+  $form->get_lists("projects"      => { "key"      => "ALL_PROJECTS",
                                         "all"      => 0,
                                         "old_id"   => \@old_project_ids },
                    "taxzones"      => "ALL_TAXZONES",
@@ -342,6 +341,9 @@ sub form_header {
   # label subs
   $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
   $TMPL_VAR{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
+  $TMPL_VAR{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all(query => [
+    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, shipto_id => $::form->{shipto_id} * 1 ]
+  ]);
   $TMPL_VAR{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all(query => [
     or => [
       cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
@@ -352,7 +354,6 @@ sub form_header {
     ]
   ]);
   $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
-  $TMPL_VAR{shipto_labels}         = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) };
   $TMPL_VAR{department_labels}     = sub { "$_[0]->{description}--$_[0]->{id}" };
 
   # vendor/customer

diff --git a/doc/changelog b/doc/changelog
index 51fe3b6..7a1c3d4 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -125,6 +125,9 @@ API-Änderungen:
   eingebaute Vorlageneditor zeigt alle *.tex-Dateien an und lässt sie
   bearbeiten.
 
+- Anzeige Stammdaten -> Waren
+  in der Suchmaske muss nun "Lagermenge" explizit angewaehlt werden, wenn die
+  Warenbestände im Suchergebnis angezeigt werden sollen.
 
 Entfernte Features:
 

diff --git a/js/dhtmlsuite/menu-for-applications.js b/js/dhtmlsuite/menu-for-applications.js
index 664ee9e..7896f91 100644 (file)
--- a/js/dhtmlsuite/menu-for-applications.js
+++ b/js/dhtmlsuite/menu-for-applications.js
@@ -2335,6 +2335,7 @@ DHTMLSuite.menuBar.prototype = {
        }\r
        // }}}  \r
        ,\r
+    unsetMenuBarState : function() { this.menuBarState = false },\r
        // {{{ __setBasicEvents()\r
     /**\r
      * Set basic events for the menu widget.\r
@@ -2345,6 +2346,14 @@ DHTMLSuite.menuBar.prototype = {
        __setBasicEvents : function()\r
        {\r
                DHTMLSuite.commonObj.addEvent(document.documentElement,"click",this.hideSubMenus);              \r
+        var menu = this;\r
+        $(document).mousedown(function(){ menu.unsetMenuBarState(); });\r
+        $('#win1').load(function(){\r
+            $('#win1').contents().mousedown(function(){\r
+                menu.hideSubMenus();\r
+                menu.menuBarState = false;\r
+            });\r
+        })\r
        }\r
 }\r
 \r

diff --git a/locale/de/all b/locale/de/all
index 4a921f2..84d3ba1 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1141,6 +1141,7 @@ $self->{texts} = {
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
   'Missing taxkeys in invoices with taxes.' => 'Fehlende Steuerschlüssel in Rechnungen mit Steuern',
+  'Missing user id!'            => 'Benutzer ID fehlt!',
   'Mitarbeiter'                 => 'Mitarbeiter',
   'Mixed (requires column "type")' => 'Gemischt (erfordert Spalte "type")',
   'Mobile1'                     => 'Mobile 1',
@@ -1175,6 +1176,7 @@ $self->{texts} = {
   'New part'                    => 'Neue Ware',
   'New sales order'             => 'Neuer Auftrag',
   'New service'                 => 'Neue Dienstleistung',
+  'New shipto'                  => 'Neue Lieferadresse',
   'New unit'                    => 'Neue Einheit',
   'New vendor'                  => 'Neuer Lieferant',
   'Next Dunning Level'          => 'Nächste Mahnstufe',
@@ -1192,6 +1194,7 @@ $self->{texts} = {
   'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' => 'Für diesen Lieferanten wurden in seinen Stammdaten keine Kontodaten hinterlegt. Solange dies nicht geschehen ist, können Sie keine Überweisungen für den Lieferanten anlegen.',
   'No bins have been added to this warehouse yet.' => 'Es wurden zu diesem Lager noch keine Lagerplätze angelegt.',
   'No business has been created yet.' => 'Es wurden noch kein Kunden-/Lieferantentyp erfasst.',
+  'No contact selected to delete' => 'Kein Ansprechpartner zum Löschen ausgewählt',
   'No customer has been selected yet.' => 'Es wurde noch kein Kunde ausgewählt.',
   'No data was found.'          => 'Es wurden keine Daten gefunden.',
   'No databases have been found on this server.' => 'Auf diesem Server wurden keine Datenbanken gefunden.',
@@ -1207,6 +1210,7 @@ $self->{texts} = {
   'No payment term has been created yet.' => 'Es wurden noch keine Zahlungsbedingungen angelegt.',
   'No prices will be updated because no prices have been entered.' => 'Es werden keine Preise aktualisiert, weil keine gültigen Preisänderungen eingegeben wurden.',
   'No problems were recognized.' => 'Es wurden keine Probleme gefunden.',
+  'No shipto selected to delete' => 'Keine Lieferadresse zum Löschen ausgewählt',
   'No transaction selected!'    => 'Keine Transaktion ausgewählt',
   'No transfers were executed in this export.' => 'In diesem SEPA-Export wurden keine Überweisungen ausgeführt.',
   'No unknown units where found.' => 'Es wurden keine unbekannten Einheiten gefunden.',
@@ -1625,6 +1629,8 @@ $self->{texts} = {
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',
   'Shipto'                      => 'Lieferanschriften',
+  'Shipto deleted.'             => 'Lieferadresse gelöscht',
+  'Shipto is in use and was flagged invalid.' => 'Lieferadresse ist noch in Verwendung, und wurde als ungültig markiert.',
   'Shopartikel'                 => 'Shopartikel',
   'Short'                       => 'Knapp',
   'Show'                        => 'Zeigen',
@@ -1833,7 +1839,6 @@ $self->{texts} = {
   'The group memberships have been saved.' => 'Die Gruppenmitgliedschaften wurden gespeichert.',
   'The group name is missing.'  => 'Der Gruppenname fehlt.',
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
-  'The login is missing.'       => 'Das Login fehlt.',
   'The long description is missing.' => 'Der Langtext fehlt.',
   'The name in row %d has already been used before.' => 'Der Name in Zeile %d wurde vorher bereits benutzt.',
   'The name is missing in row %d.' => 'Der Name fehlt in Zeile %d.',

diff --git a/templates/print/Default/bwa.html b/templates/print/Default/bwa.html
new file mode 100644 (file)
index 0000000..91907d8
--- /dev/null
+++ b/templates/print/Default/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/print/Default/taxbird.txb b/templates/print/Default/taxbird.txb
new file mode 100644 (file)
index 0000000..c1a8a39
--- /dev/null
+++ b/templates/print/Default/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/print/Default/ustva-2012.tex b/templates/print/Default/ustva-2012.tex
new file mode 100644 (file)
index 0000000..3a35db9
--- /dev/null
+++ b/templates/print/Default/ustva-2012.tex
@@ -0,0 +1,153 @@
+% German USTVA template for taxreports
+% Contributed by Marcus Habermehl
+% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
+%
+%
+\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
+\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-2012.pdf}}}%Seite 2
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2012.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%>}~--~
+<%else%>
+\small{~}
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%else%>
+\small{~}
+<%end fax%>
+}& & & & &\\[1.8mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
+\end{tabular}\\[2.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[9.5mm]
+\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
+\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
+\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
+\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\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%>}\\[13.5mm]
+\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
+\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
+\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
+\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
+\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/print/Default/ustva.html b/templates/print/Default/ustva.html
new file mode 100644 (file)
index 0000000..1f5da1a
--- /dev/null
+++ b/templates/print/Default/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/print/Default/ustva.tex b/templates/print/Default/ustva.tex
new file mode 100644 (file)
index 0000000..da26f47
--- /dev/null
+++ b/templates/print/Default/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/print/Default/winston.xml b/templates/print/Default/winston.xml
new file mode 100644 (file)
index 0000000..2bb63da
--- /dev/null
+++ b/templates/print/Default/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/print/French/bin_list.html b/templates/print/French/bin_list.html
new file mode 100644 (file)
index 0000000..d57632d
--- /dev/null
+++ b/templates/print/French/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/print/French/bwa.html b/templates/print/French/bwa.html
new file mode 100644 (file)
index 0000000..91907d8
--- /dev/null
+++ b/templates/print/French/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/print/French/taxbird.txb b/templates/print/French/taxbird.txb
new file mode 100644 (file)
index 0000000..c1a8a39
--- /dev/null
+++ b/templates/print/French/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/print/French/ustva-2012.tex b/templates/print/French/ustva-2012.tex
new file mode 100644 (file)
index 0000000..3a35db9
--- /dev/null
+++ b/templates/print/French/ustva-2012.tex
@@ -0,0 +1,153 @@
+% German USTVA template for taxreports
+% Contributed by Marcus Habermehl
+% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
+%
+%
+\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
+\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-2012.pdf}}}%Seite 2
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2012.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%>}~--~
+<%else%>
+\small{~}
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%else%>
+\small{~}
+<%end fax%>
+}& & & & &\\[1.8mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
+\end{tabular}\\[2.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[9.5mm]
+\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
+\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
+\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
+\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\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%>}\\[13.5mm]
+\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
+\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
+\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
+\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
+\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/print/French/ustva.html b/templates/print/French/ustva.html
new file mode 100644 (file)
index 0000000..1f5da1a
--- /dev/null
+++ b/templates/print/French/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/print/French/ustva.tex b/templates/print/French/ustva.tex
new file mode 100644 (file)
index 0000000..da26f47
--- /dev/null
+++ b/templates/print/French/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/print/French/winston.xml b/templates/print/French/winston.xml
new file mode 100644 (file)
index 0000000..2bb63da
--- /dev/null
+++ b/templates/print/French/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/print/German/ustva-2004.tex b/templates/print/German/ustva-2004.tex
deleted file mode 100644 (file)
index fb4b40c..0000000
--- a/templates/print/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/print/German/ustva-2005.tex b/templates/print/German/ustva-2005.tex
deleted file mode 100644 (file)
index 30de7cf..0000000
--- a/templates/print/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/print/German/ustva-2006.tex b/templates/print/German/ustva-2006.tex
deleted file mode 100644 (file)
index 7a54edb..0000000
--- a/templates/print/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/print/German/ustva-2007.tex b/templates/print/German/ustva-2007.tex
deleted file mode 100644 (file)
index 1965fa1..0000000
--- a/templates/print/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/print/German/ustva-2008.tex b/templates/print/German/ustva-2008.tex
deleted file mode 100644 (file)
index 2a50d36..0000000
--- a/templates/print/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/print/German/ustva-2010.tex b/templates/print/German/ustva-2010.tex
deleted file mode 100644 (file)
index 0192a08..0000000
--- a/templates/print/German/ustva-2010.tex
+++ /dev/null
@@ -1,153 +0,0 @@
-% German USTVA template for taxreports
-% Contributed by Marcus Habermehl
-% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
-%
-%
-\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
-\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-2010.pdf}}}%Seite 2
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2010.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%>}~--~
-<%else%>
-\small{~}
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%else%>
-\small{~}
-<%end fax%>
-}& & & & &\\[1.8mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
-\end{tabular}\\[2.5mm]
-\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
-&&&&\\[9.5mm]
-\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
-\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
-\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
-\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\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%>}\\[13.5mm]
-\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
-\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
-\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
-\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
-\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/print/German/ustva-2011.tex b/templates/print/German/ustva-2011.tex
deleted file mode 100644 (file)
index 0439373..0000000
--- a/templates/print/German/ustva-2011.tex
+++ /dev/null
@@ -1,153 +0,0 @@
-% German USTVA template for taxreports
-% Contributed by Marcus Habermehl
-% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
-%
-%
-\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
-\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-2011.pdf}}}%Seite 2
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2011.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%>}~--~
-<%else%>
-\small{~}
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%else%>
-\small{~}
-<%end fax%>
-}& & & & &\\[1.8mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
-\end{tabular}\\[2.5mm]
-\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
-&&&&\\[9.5mm]
-\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
-\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
-\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
-\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\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%>}\\[13.5mm]
-\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
-\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
-\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
-\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
-\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/print/German/ustva-2012.tex b/templates/print/German/ustva-2012.tex
new file mode 100644 (file)
index 0000000..3a35db9
--- /dev/null
+++ b/templates/print/German/ustva-2012.tex
@@ -0,0 +1,153 @@
+% German USTVA template for taxreports
+% Contributed by Marcus Habermehl
+% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
+%
+%
+\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
+\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-2012.pdf}}}%Seite 2
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2012.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%>}~--~
+<%else%>
+\small{~}
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%else%>
+\small{~}
+<%end fax%>
+}& & & & &\\[1.8mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
+\end{tabular}\\[2.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[9.5mm]
+\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
+\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
+\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
+\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\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%>}\\[13.5mm]
+\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
+\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
+\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
+\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
+\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/print/Service/bin_list.html b/templates/print/Service/bin_list.html
new file mode 100644 (file)
index 0000000..d57632d
--- /dev/null
+++ b/templates/print/Service/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/print/Service/bwa.html b/templates/print/Service/bwa.html
new file mode 100644 (file)
index 0000000..91907d8
--- /dev/null
+++ b/templates/print/Service/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/print/Service/taxbird.txb b/templates/print/Service/taxbird.txb
new file mode 100644 (file)
index 0000000..c1a8a39
--- /dev/null
+++ b/templates/print/Service/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/print/Service/ustva-2012.tex b/templates/print/Service/ustva-2012.tex
new file mode 100644 (file)
index 0000000..3a35db9
--- /dev/null
+++ b/templates/print/Service/ustva-2012.tex
@@ -0,0 +1,153 @@
+% German USTVA template for taxreports
+% Contributed by Marcus Habermehl
+% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
+%
+%
+\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
+\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-2012.pdf}}}%Seite 2
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2012.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%>}~--~
+<%else%>
+\small{~}
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%else%>
+\small{~}
+<%end fax%>
+}& & & & &\\[1.8mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
+\end{tabular}\\[2.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[9.5mm]
+\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
+\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
+\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
+\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\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%>}\\[13.5mm]
+\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
+\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
+\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
+\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
+\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/print/Service/ustva.html b/templates/print/Service/ustva.html
new file mode 100644 (file)
index 0000000..1f5da1a
--- /dev/null
+++ b/templates/print/Service/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/print/Service/ustva.tex b/templates/print/Service/ustva.tex
new file mode 100644 (file)
index 0000000..da26f47
--- /dev/null
+++ b/templates/print/Service/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/print/Service/winston.xml b/templates/print/Service/winston.xml
new file mode 100644 (file)
index 0000000..2bb63da
--- /dev/null
+++ b/templates/print/Service/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/print/f-tex/bin_list.html b/templates/print/f-tex/bin_list.html
new file mode 100644 (file)
index 0000000..d57632d
--- /dev/null
+++ b/templates/print/f-tex/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/print/f-tex/bwa.html b/templates/print/f-tex/bwa.html
new file mode 100644 (file)
index 0000000..91907d8
--- /dev/null
+++ b/templates/print/f-tex/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/print/f-tex/statement.html b/templates/print/f-tex/statement.html
new file mode 100644 (file)
index 0000000..37e612c
--- /dev/null
+++ b/templates/print/f-tex/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/print/f-tex/taxbird.txb b/templates/print/f-tex/taxbird.txb
new file mode 100644 (file)
index 0000000..c1a8a39
--- /dev/null
+++ b/templates/print/f-tex/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/print/f-tex/ustva-2012.tex b/templates/print/f-tex/ustva-2012.tex
new file mode 100644 (file)
index 0000000..3a35db9
--- /dev/null
+++ b/templates/print/f-tex/ustva-2012.tex
@@ -0,0 +1,153 @@
+% German USTVA template for taxreports
+% Contributed by Marcus Habermehl
+% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
+%
+%
+\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
+\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-2012.pdf}}}%Seite 2
+{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2012.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%>}~--~
+<%else%>
+\small{~}
+<%end tel%>
+<%if fax%>
+\small{Fax: <%fax%>}
+<%else%>
+\small{~}
+<%end fax%>
+}& & & & &\\[1.8mm]
+\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
+\end{tabular}\\[2.5mm]
+\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
+&&&&\\[9.5mm]
+\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
+\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
+\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
+\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
+\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
+\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
+\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
+\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%>}\\[13.5mm]
+\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
+\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
+\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
+\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
+\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/print/f-tex/ustva.html b/templates/print/f-tex/ustva.html
new file mode 100644 (file)
index 0000000..1f5da1a
--- /dev/null
+++ b/templates/print/f-tex/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/print/f-tex/ustva.tex b/templates/print/f-tex/ustva.tex
new file mode 100644 (file)
index 0000000..da26f47
--- /dev/null
+++ b/templates/print/f-tex/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/print/f-tex/winston.xml b/templates/print/f-tex/winston.xml
new file mode 100644 (file)
index 0000000..2bb63da
--- /dev/null
+++ b/templates/print/f-tex/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/webpages/ct/_contact.html b/templates/webpages/ct/_contact.html
index 995c260..7552600 100644 (file)
--- a/templates/webpages/ct/_contact.html
+++ b/templates/webpages/ct/_contact.html
@@ -116,6 +116,8 @@
      </tr>
     </table>
 
-    <input type="submit" id="delete_contact" name="action" value="[% 'Delete Contact' | $T8 %]" [% IF cp_used %]'disabled'[% END %]>
+[% IF cp_id %]
+    <input type="submit" id="delete_contact" name="action" value="[% 'Delete Contact' | $T8 %]">
+[% END %]
 
     <br style="clear: left" />

diff --git a/templates/webpages/ct/_shipto.html b/templates/webpages/ct/_shipto.html
index c8db22d..cb0d59c 100644 (file)
--- a/templates/webpages/ct/_shipto.html
+++ b/templates/webpages/ct/_shipto.html
@@ -3,8 +3,8 @@
      <tr>
       <th align="right">[% 'Shipping Address' | $T8 %]</th>
       <td>
-       [% L.select_tag('shipto_id', L.options_for_select(SHIPTO, default => shipto_id, value => 'shipto_id', title_sub => \shipto_label, with_empty => 1),
-                       onchange => "\$('#shipto_table').load('ct.pl?action=get_shipto&id=' + \$('#cvid').attr('value') + '&db=' + \$('#db').attr('value') + '&shipto_id=' + this.value)") %]
+       [% L.select_tag('shipto_id', L.options_for_select(SHIPTO, default => shipto_id, value => 'shipto_id', title_sub => \shipto_label, with_empty => 1, empty_title => LxERP.t8('New shipto')),
+                       onchange => "\$('#shipto').load('ct.pl?action=get_shipto&id=' + \$('#cvid').attr('value') + '&db=' + \$('#db').attr('value') + '&shipto_id=' + this.value)") %]
       </td>
      </tr>
 
@@ -59,3 +59,8 @@
       <td><input id="shiptoemail" name="shiptoemail" size="45" value="[% HTML.escape(shiptoemail) %]"></td>
      </tr>
     </table>
+
+[%- IF shipto_id %]
+    <input type="submit" id="delete_shipto" name="action" value="[% 'Delete Shipto' | $T8 %]">
+    <br style="clear: left" />
+[%- END %]

diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html
index 501ebaa..814ccb0 100644 (file)
--- a/templates/webpages/ct/form_header.html
+++ b/templates/webpages/ct/form_header.html
@@ -299,9 +299,6 @@
 
    <div id="shipto" class="tabcontent">
     [% INCLUDE 'ct/_shipto.html' %]
-
-    <input type="submit" id="delete_shipto" name="action" value="[% 'Delete Shipto' | $T8 %]" disabled>
-    <br style="clear: left" />
    </div>
 
    <div id="contacts" class="tabcontent">

diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index b195637..000811e 100644 (file)
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -159,17 +159,7 @@
           [%- END %]
 
           [%- ELSE %]
-          <select name="shipto_id" class="fixed_width" >
-           <option></option>
-           [%- FOREACH row = ALL_SHIPTO %]
-           <option value="[% HTML.escape(row.shipto_id) %]"[% IF shipto_id == row.shipto_id %] selected[% END %]>
-            [%- HTML.escape(row.shiptoname) -%]
-            [%- IF row.shiptodepartment_1 %]; [% HTML.escape(row.shiptodepartment_1) -%][% END -%]
-            [%- IF row.shiptostreet %]; [% HTML.escape(row.shiptostreet) -%][% END -%]
-            [%- IF row.shiptocity %]; [% HTML.escape(row.shiptocity) -%][% END -%]
-           </option>
-           [%- END %]
-          </select>
+            [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title='displayable_id', with_empty=1), class='fixed_width') %]
           [%- END %]
          </td>
         </tr>

diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
index 2f99cc6..99e2dfb 100644 (file)
--- a/templates/webpages/dunning/show_invoices.html
+++ b/templates/webpages/dunning/show_invoices.html
@@ -78,7 +78,7 @@
   <hr size=3 noshade>
 
   <input type="checkbox" name="force_lang" size="6" value="1" onclick="document.getElementsByName('language_id')[0].disabled = !document.getElementsByName('force_lang')[0].checked;">
-  [% 'Override invoice language' | T8 %]
+  [% 'Override invoice language' | $T8 %]
   [% PRINT_OPTIONS %]
 
   <br>

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 6b25e8a..80dd758 100644 (file)
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -63,7 +63,7 @@
         <tr>
           <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
-            [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title_sub=\shipto_labels, with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
+            [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title='displayable_id', with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
           </td>
         </tr>
 [%- END %]

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index 45b529b..c402f1b 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -72,6 +72,9 @@ window.onload=clockon
  [%- END %]
  </ul>
 
+ <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
+ </iframe>
  <script type="text/javascript">
   <!--
 
@@ -96,8 +99,5 @@ function open_url(url, target) {
     -->
  </script>
 
- <iframe id="win1" src="[% callback %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-  <p>[% 'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' | $T8 %]</p>
- </iframe>
 </body>
 </html>

diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index 68c2286..ed67b02 100644 (file)
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -66,7 +66,7 @@
                   <tr>
                     <th align="right">[% 'Shipping Address' | $T8 %]</th>
                     <td>
-                      [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title_sub=\shipto_labels, with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
+                      [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title='displayable_id', with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
                     </td>
                   </tr>
 [%- END %]