From 82ee22347be2f2ee96d09a9fd0b45710f9552582 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stephan=20K=C3=B6hler?= <s.koehler@linet-services.de>
Date: Sat, 7 Jan 2006 12:13:46 +0000
Subject: [PATCH] =?utf8?q?Merge=20von=20704,707,730,731=20aus=20unstable:?=
 =?utf8?q?=20USTVA=20Bugfix=20-704=20=20Diverse=20USTVA=20Bugs=20geloest?=
 =?utf8?q?=20=20Solve=20Bug:=20=2049:=20UST=20wurde=20berechnet,=20jetzt?=
 =?utf8?q?=20ausgelesen,=20mit=20Patchen=20von=20Andre=20Schubert=20THX=20?=
 =?utf8?q?=20Solve=20Bug:=20164:=20Grunds=C3=A4tzliche=20Berechnung=20der?=
 =?utf8?q?=20UST=20=20Solve=20Bug:=20173:=20Teilbezahlte=20Rechnungen=20be?=
 =?utf8?q?i=20IST-Versteuerung=20sollten=20jetzt=20klappen,=20THX=20Yvonne?=
 =?utf8?q?=20Einberger=20=20Vorlagen=20ueberarbeitet,=20sub=20ustva=20und?=
 =?utf8?q?=20sub=20get=5Faccounts=5Fustva=20in=20ustva.pm=20verlegt.=20=20?=
 =?utf8?q?Alle=20Variablen=20der=20USTVA=20durchg=C3=A4ngig=20nutzbar=20ge?=
 =?utf8?q?macht.=20-707=20=20Nachtrag=20zu=20rev=20704.=20USTVA=20Berechnu?=
 =?utf8?q?ng=20kosmetisch=20ver=C3=A4ndert.=20-730=20=20Nachtrag=20zu=20R7?=
 =?utf8?q?04=20'Diverse=20USTVA=20Bugs=20geloest'=20-731=20Solved=20Bug=20?=
 =?utf8?q?237.=20USTVA=20Vorsteuer=20wird=20nicht=20richtig=20berechnet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/RP.pm                            |  20 +-
 SL/USTVA.pm                         | 330 ++++++++++++++++++++++++++++
 bin/mozilla/am.pl                   |  48 +++-
 bin/mozilla/ustva.pl                |  79 +++----
 doc/ustva.html                      |   8 +-
 sql/Germany-DATEV-SKR03EU-chart.sql |   7 +-
 sql/Pg-upgrade-2.1.1-2.1.2.sql      |  10 +-
 sql/liste.sql                       |   4 +-
 templates/German-ustva-2004.tex     |  21 +-
 templates/German-ustva-2005.tex     |  24 +-
 templates/German-ustva-2006.tex     |  24 +-
 templates/German-ustva.html         | 212 ++++++++++++++++--
 12 files changed, 668 insertions(+), 119 deletions(-)

diff --git a/SL/RP.pm b/SL/RP.pm
index f7afbb0b1..6c328326c 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1336,7 +1336,7 @@ sub get_accounts_g {
   my @accno;
   my $accno;
   my $ref;
-
+  #print $query;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
@@ -2506,7 +2506,8 @@ sub ustva {
 
   my $last_period     = 0;
   my $category        = "pos_ustva";
-  my @categories_cent = qw(51r 86r 97r 93r 96 66 43 45 53 62 65 67);
+  my @categories_cent = qw(51r 511 86r 861 97r 971 93r 931
+                           96 66 43 45 53 62 65 67);
   my @categories_euro = qw(48 51 86 91 97 93 94);
   $form->{decimalplaces} *= 1;
 
@@ -2544,12 +2545,15 @@ sub ustva {
   #   }
   #
   #    }
-
-  $form->{"51r"} = $form->{"51"} * 0.16;
-  $form->{"86r"} = $form->{"86"} * 0.07;
-  $form->{"97r"} = $form->{"97"} * 0.16;
-  $form->{"93r"} = $form->{"93"} * 0.07;
-  $form->{"96"}  = $form->{"94"} * 0.16;
+  
+  #
+  # Berechnung der USTVA Formularfelder
+  #
+  $form->{"51r"} = $form->{"511"};
+  $form->{"86r"} = $form->{"861"};
+  $form->{"97r"} = $form->{"971"};
+  $form->{"93r"} = $form->{"931"};
+  #$form->{"96"}  = $form->{"94"} * 0.16;
   $form->{"43"}  =
     $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} +
     $form->{"96"};
diff --git a/SL/USTVA.pm b/SL/USTVA.pm
index ff6355635..af1896602 100644
--- a/SL/USTVA.pm
+++ b/SL/USTVA.pm
@@ -556,4 +556,334 @@ sub process_query {
   $main::lxdebug->leave_sub();
 }
 
+
+sub ustva {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $last_period     = 0;
+  my $category        = "pos_ustva";
+  my @categories_cent = qw(511 861 36 80 971 931 98 96 53 74 
+                           85 65 66 61 62 67 63 64 59 69 39 83 
+                           Z43 Z45 Z53 Z62 Z65 Z67);
+                           
+  my @categories_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93 
+                           95 94 42 60 45 52 73 84);
+
+  $form->{decimalplaces} *= 1;
+
+  foreach $item (@categories_cent) {
+    $form->{"$item"} = 0;
+  }
+  foreach $item (@categories_euro) {
+    $form->{"$item"} = 0;
+  }
+
+
+  &get_accounts_ustva($dbh, $last_period, $form->{fromdate}, $form->{todate},
+                  $form, $category);
+
+
+  #
+  # Berechnung der USTVA Formularfelder
+  #
+  $form->{"51r"} = $form->{"511"};
+  $form->{"86r"} = $form->{"861"};
+  $form->{"97r"} = $form->{"971"};
+  $form->{"93r"} = $form->{"931"};
+  $form->{"Z43"} = $form->{"511"}+ $form->{"861"} + 
+                   $form->{"36"} + $form->{"80"}  +
+                   $form->{"971"}+ $form->{"931"} + 
+                   $form->{"96"} + $form->{"98"};
+  $form->{"Z45"} = $form->{"Z43"};
+  $form->{"Z53"} = $form->{"Z43"};
+  $form->{"Z62"} = $form->{"Z43"}- $form->{"66"} -
+                   $form->{"61"} - $form->{"62"} -
+                   $form->{"63"} - $form->{"64"} -
+                   $form->{"59"};
+  $form->{"Z65"} = $form->{"Z62"}- $form->{"69"};
+  $form->{"83"}  = $form->{"Z65"}- $form->{"39"};
+  
+  foreach $item (@categories_cent) {
+    $form->{$item} =
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), 2, '0');
+  }
+
+  foreach $item (@categories_euro) {
+    $form->{$item} =
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), 0, '0');
+  }
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub get_accounts_ustva {
+  $main::lxdebug->enter_sub();
+
+  my ($dbh, $last_period, $fromdate, $todate, $form, $category) = @_;
+
+  my ($null, $department_id) = split /--/, $form->{department};
+
+  my $query;
+  my $dpt_where;
+  my $dpt_join;
+  my $project;
+  my $where    = "1 = 1";
+  my $glwhere  = "";
+  my $subwhere = "";
+  my $ARwhere = "";
+  my $arwhere = "";
+  my $item;
+
+  if ($fromdate) {
+    if ($form->{method} eq 'cash') {
+      $subwhere .= " AND transdate >= '$fromdate'";
+      $glwhere = " AND ac.transdate >= '$fromdate'";
+      $ARwhere .= " AND acc.transdate >= '$fromdate'";
+      $where .= " AND ac.transdate >= '$fromdate'";
+      
+    }
+  }
+
+  if ($todate) {
+    $where    .= " AND ac.transdate <= '$todate'";
+    $ARwhere    .= " AND acc.transdate <= '$todate'";
+    $subwhere .= " AND transdate <= '$todate'";
+  }
+
+  if ($department_id) {
+    $dpt_join = qq|
+               JOIN department t ON (a.department_id = t.id)
+		  |;
+    $dpt_where = qq|
+               AND t.id = $department_id
+	           |;
+  }
+
+  if ($form->{project_id}) {
+    $project = qq|
+                 AND ac.project_id = $form->{project_id}
+		 |;
+  }
+
+  if ($form->{method} eq 'cash') {
+
+    $query = qq|
+
+ SELECT
+   SUM( ac.amount *
+      -- Bezahlt / Rechnungssumme
+     ( 
+       SELECT SUM(acc.amount)
+       FROM acc_trans acc
+       INNER JOIN chart c ON (acc.chart_id = c.id AND c.link like '%AR_paid%')
+       WHERE
+        1=1 
+        $ARwhere
+        AND acc.trans_id = ac.trans_id
+        )
+     / 
+     ( 
+      select amount from ar where id = ac.trans_id  
+     )
+   ) AS amount,
+   c.pos_ustva
+   FROM acc_trans ac
+   JOIN chart c ON (c.id = ac.chart_id)
+   --JOIN ar ON (ar.id = ac.trans_id)
+   where 
+     1=1 
+     -- Here no where, please. All Transactions ever should be
+     -- testet if they are paied in the USTVA report period.
+   GROUP BY c.pos_ustva
+	UNION
+
+	         SELECT sum(ac.amount) AS amount,
+		 c.$category
+		 FROM acc_trans ac
+		 JOIN chart c ON (c.id = ac.chart_id)
+		 JOIN ap a ON (a.id = ac.trans_id)
+		 $dpt_join
+		 WHERE $where
+		 $dpt_where
+		 AND ac.trans_id IN
+		   (
+		     SELECT trans_id
+		     FROM acc_trans
+		     JOIN chart ON (chart_id = id)
+		     WHERE link LIKE '%AP_amount%'
+		     $subwhere
+		   )
+
+		 $project
+		 GROUP BY c.$category
+
+        UNION
+
+		 SELECT sum(ac.amount) AS amount,
+		 c.$category
+		 FROM acc_trans ac
+		 JOIN chart c ON (c.id = ac.chart_id)
+		 JOIN gl a ON (a.id = ac.trans_id)
+		 $dpt_join
+		 WHERE $where
+		 $glwhere
+		 $dpt_from
+		 AND NOT (c.link = 'AR' OR c.link = 'AP')
+		 $project
+		 GROUP BY c.$category
+
+		 |;
+
+    if ($form->{project_id}) {
+
+      $query .= qq|
+
+	 UNION
+
+		 SELECT SUM(ac.sellprice * ac.qty) AS amount,
+		 c.$category
+		 FROM invoice ac
+	         JOIN ar a ON (a.id = ac.trans_id)
+		 JOIN parts p ON (ac.parts_id = p.id)
+		 JOIN chart c on (p.income_accno_id = c.id)
+	         $dpt_join
+	-- use transdate from subwhere
+		 WHERE 1 = 1 $subwhere
+		 AND c.category = 'I'
+		 $dpt_where
+		 AND ac.trans_id IN
+		   (
+		     SELECT trans_id
+		     FROM acc_trans
+		     JOIN chart ON (chart_id = id)
+		     WHERE link LIKE '%AR_paid%'
+		     $subwhere
+		   )
+
+		 $project
+		 GROUP BY c.$category
+
+	 UNION
+
+		 SELECT SUM(ac.sellprice) AS amount,
+		 c.$category
+		 FROM invoice ac
+	         JOIN ap a ON (a.id = ac.trans_id)
+		 JOIN parts p ON (ac.parts_id = p.id)
+		 JOIN chart c on (p.expense_accno_id = c.id)
+	         $dpt_join
+		 WHERE 1 = 1 $subwhere
+		 AND c.category = 'E'
+		 $dpt_where
+		 AND ac.trans_id IN
+		   (
+		     SELECT trans_id
+		     FROM acc_trans
+		     JOIN chart ON (chart_id = id)
+		     WHERE link LIKE '%AP_paid%'
+		     $subwhere
+		   )
+
+		 $project
+		 GROUP BY c.$category
+		 |;
+    }
+
+  } else {
+
+    if ($department_id) {
+      $dpt_join = qq|
+	      JOIN dpt_trans t ON (t.trans_id = ac.trans_id)
+	      |;
+      $dpt_where = qq|
+               AND t.department_id = $department_id
+	      |;
+    }
+
+    $query = qq|
+
+		 SELECT sum(ac.amount) AS amount,
+		 c.$category
+		 FROM acc_trans ac
+		 JOIN chart c ON (c.id = ac.chart_id)
+		 $dpt_join
+		 WHERE $where
+		 $dpt_where
+		 $project
+		 GROUP BY c.$category
+		 |;
+
+    if ($form->{project_id}) {
+
+      $query .= qq|
+
+	UNION
+
+		 SELECT SUM(ac.sellprice * ac.qty) AS amount,
+		 c.$category
+		 FROM invoice ac
+	         JOIN ar a ON (a.id = ac.trans_id)
+		 JOIN parts p ON (ac.parts_id = p.id)
+		 JOIN chart c on (p.income_accno_id = c.id)
+	         $dpt_join
+	-- use transdate from subwhere
+		 WHERE 1 = 1 $subwhere
+		 AND c.category = 'I'
+		 $dpt_where
+		 $project
+		 GROUP BY c.$category
+
+	UNION
+
+		 SELECT SUM(ac.sellprice * ac.qty) * -1 AS amount,
+		 c.$category
+		 FROM invoice ac
+	         JOIN ap a ON (a.id = ac.trans_id)
+		 JOIN parts p ON (ac.parts_id = p.id)
+		 JOIN chart c on (p.expense_accno_id = c.id)
+	         $dpt_join
+		 WHERE 1 = 1 $subwhere
+		 AND c.category = 'E'
+		 $dpt_where
+		 $project
+		 GROUP BY c.$category
+		 |;
+
+    }
+  }
+
+  my @accno;
+  my $accno;
+  my $ref;
+  #print $query;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    if ($ref->{amount} < 0) {
+      $ref->{amount} *= -1;
+    }
+    if ($category eq "pos_bwa") {
+      if ($last_period) {
+        $form->{ $ref->{$category} }{kumm} += $ref->{amount};
+      } else {
+        $form->{ $ref->{$category} }{jetzt} += $ref->{amount};
+      }
+    } else {
+      $form->{ $ref->{$category} } += $ref->{amount};
+    }
+  }
+  $sth->finish;
+
+  $main::lxdebug->leave_sub();
+}
+
+
 1;
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 48b875a57..c936bc19b 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -111,14 +111,46 @@ sub account_header {
 	      </tr>|;
 
   $form->{selectustva} = "<option>\n";
-  %ustva = (48 => "Steuerfrei, Zeile 48",
-            51 => "Steuerpflichtig 16%, Zeile 51",
-            86 => "Steuerpflichtig 7%, Zeile 86",
-            91 => "Steuerfrei, Zeile 91",
-            97 => "Steuerpflichtig 16%, Zeile 97",
-            93 => "Steuerpflichtig 7%, Zeile 93",
-            94 => "Steuerpflichtig 16%, Zeile 94",
-            66 => "Vorsteuer, Zeile 66");
+  %ustva = (41  => "Steuerfrei IGL a. Abnehmer m. UStID (§4 Nr. 1b UStG), Nr. 41",
+            44  => "Steuerfrei IGL n. Fahrz. o. UStID (§4 Nr. 1b UStG), Nr. 44",
+            49  => "Steuerfrei IGL n. Fahrz. a. Unternehmen (§2a UStG), Nr. 49",
+            43  => "Weit Steuerfreie Umsätze m. VSt Abzug (Ausfuhr, Umsätze §4 Nr.2-7 UStG), Nr. 43",
+            48  => "Steuerfreie Umsätze ohne VSt.abzug (§4 Nr.8-28 UStG), Nr. 48",
+            51  => "Steuerpflichtige Umsätze 16%, Nr. 51",
+            511 => "Steuerpflichtige Umsätze 16%, Nr. 51 rechts",
+            86  => "Steuerpflichtige Umsätze 7%, Nr. 86",
+            861 => "Steuerpflichtige Umsätze 7%, Nr. 86 rechts",
+            35  => "Nr. 35",
+            77  => "Nr. 77",
+            76  => "Nr. 76",
+            80  => "Nr. 80",
+            91  => "Steuerfrei, Nr. 91",
+            97  => "Steuerpflichtig 16%, Nr. 97",
+            971 => "Steuerpflichtig 16%, Nr. 97 rechts",
+            93  => "Steuerpflichtig 7%, Nr. 93",
+            931 => "Steuerpflichtig 7%, Nr. 93 rechts",
+            95  => "Nr. 95",
+            94  => "Steuerpflichtig 16%, Nr. 94",            
+            96  => "Nr. 96",
+            42  => "Nr. 42",
+            60  => "Nr. 60",
+            45  => "Nr. 45",
+            52  => "Nr. 52",
+            53  => "Nr. 53",
+            73  => "Nr. 73",
+            74  => "Nr. 74",
+            84  => "Nr. 84",
+            85  => "Nr. 85",
+            65  => "Nr. 65",
+            66  => "Abziehbare Vorsteuerbeträge, Nr. 66",
+            61  => "Nr. 61",
+            62  => "Nr. 62",
+            67  => "Nr. 67",
+            63  => "Nr. 63",
+            64  => "Nr. 64",
+            59  => "Nr. 59",
+            69  => "Nr. 69",
+            39  => "Nr. 39");
   foreach $item (sort({ $a <=> $b } keys %ustva)) {
     if ($item == $form->{pos_ustva}) {
       $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 5bb85b133..6fa1ed75e 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -831,106 +831,106 @@ sub generate_ustva {
 
     #yearly report
     if ($form->{duetyp} eq "13") {
-      $form->{fromdate} = "1.1.$form->{year}";
-      $form->{todate}   = "31.12.$form->{year}";
+      $form->{fromdate} = "$form->{year}-01-01";
+      $form->{todate}   = "$form->{year}-12-31";
     }
 
     #Quater reports
     if ($form->{duetyp} eq "A") {
-      $form->{fromdate} = "1.1.$form->{year}";
-      $form->{todate}   = "31.3.$form->{year}";
+      $form->{fromdate} = "$form->{year}-01-01";
+      $form->{todate}   = "$form->{year}-03-31";
       $form->{'0441'}   = "X";
     }
     if ($form->{duetyp} eq "B") {
-      $form->{fromdate} = "1.4.$form->{year}";
-      $form->{todate}   = "30.6.$form->{year}";
+      $form->{fromdate} = "$form->{year}-04-01";
+      $form->{todate}   = "$form->{year}-06-30";
       $form->{'0442'}   = "X";
     }
     if ($form->{duetyp} eq "C") {
-      $form->{fromdate} = "1.7.$form->{year}";
-      $form->{todate}   = "30.9.$form->{year}";
+      $form->{fromdate} = "$form->{year}-07-01";
+      $form->{todate}   = "$form->{year}-09-30";
       $form->{'0443'}   = "X";
     }
     if ($form->{duetyp} eq "D") {
-      $form->{fromdate} = "1.10.$form->{year}";
-      $form->{todate}   = "31.12.$form->{year}";
+      $form->{fromdate} = "$form->{year}-10-01";
+      $form->{todate}   = "$form->{year}-12-31";
       $form->{'0444'}   = "X";
     }
 
     #Monthly reports
   SWITCH: {
       $form->{duetyp} eq "01" && do {
-        $form->{fromdate} = "1.1.$form->{year}";
-        $form->{todate}   = "31.1.$form->{year}";
+        $form->{fromdate} = "$form->{year}-01-01";
+        $form->{todate}   = "$form->{year}-01-31";
         $form->{'0401'}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "02" && do {
-        $form->{fromdate} = "1.2.$form->{year}";
+        $form->{fromdate} = "$form->{year}-02-01";
 
         #this works from 1901 to 2099, 1900 and 2100 fail.
         my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
-        $form->{todate} = "$leap.2.$form->{year}";
+        $form->{todate} = "$form->{year}-02-$leap";
         $form->{"0402"} = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "03" && do {
-        $form->{fromdate} = "1.3.$form->{year}";
-        $form->{todate}   = "31.3.$form->{year}";
+        $form->{fromdate} = "$form->{year}-03-01";
+        $form->{todate}   = "$form->{year}-03-31";
         $form->{"0403"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "04" && do {
-        $form->{fromdate} = "1.4.$form->{year}";
-        $form->{todate}   = "30.4.$form->{year}";
+        $form->{fromdate} = "$form->{year}-04-01";
+        $form->{todate}   = "$form->{year}-04-30";
         $form->{"0404"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "05" && do {
-        $form->{fromdate} = "1.5.$form->{year}";
-        $form->{todate}   = "31.5.$form->{year}";
+        $form->{fromdate} = "$form->{year}-05-01";
+        $form->{todate}   = "$form->{year}-05-31";
         $form->{"0405"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "06" && do {
-        $form->{fromdate} = "1.6.$form->{year}";
-        $form->{todate}   = "30.6.$form->{year}";
+        $form->{fromdate} = "$form->{year}-06-01";
+        $form->{todate}   = "$form->{year}-06-30";
         $form->{"0406"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "07" && do {
-        $form->{fromdate} = "1.7.$form->{year}";
-        $form->{todate}   = "31.7.$form->{year}";
+        $form->{fromdate} = "$form->{year}-07-01";
+        $form->{todate}   = "$form->{year}-07-31";
         $form->{"0407"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "08" && do {
-        $form->{fromdate} = "1.8.$form->{year}";
-        $form->{todate}   = "31.8.$form->{year}";
+        $form->{fromdate} = "$form->{year}-08-01";
+        $form->{todate}   = "$form->{year}-08-31";
         $form->{"0408"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "09" && do {
-        $form->{fromdate} = "1.9.$form->{year}";
-        $form->{todate}   = "30.9.$form->{year}";
+        $form->{fromdate} = "$form->{year}-09-01";
+        $form->{todate}   = "$form->{year}-09-30";
         $form->{"0409"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "10" && do {
-        $form->{fromdate} = "1.10.$form->{year}";
-        $form->{todate}   = "31.10.$form->{year}";
+        $form->{fromdate} = "$form->{year}-10-01";
+        $form->{todate}   = "$form->{year}-10-31";
         $form->{"0410"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "11" && do {
-        $form->{fromdate} = "1.11.$form->{year}";
-        $form->{todate}   = "30.11.$form->{year}";
+        $form->{fromdate} = "$form->{year}-11-01";
+        $form->{todate}   = "$form->{year}-11-30";
         $form->{"0411"}   = "X";
         last SWITCH;
       };
       $form->{duetyp} eq "12" && do {
-        $form->{fromdate} = "1.12.$form->{year}";
-        $form->{todate}   = "31.12.$form->{year}";
+        $form->{fromdate} = "$form->{year}-12-01";
+        $form->{todate}   = "$form->{year}-12-31";
         $form->{"0412"}   = "X";
         last SWITCH;
       };
@@ -938,7 +938,10 @@ sub generate_ustva {
   }
 
   #$myconfig = \%myconfig;
-  RP->ustva(\%myconfig, \%$form);
+  #$myconfig->{dateformat} = 'yyyy-mm-dd';
+  #$form->{fromdate}= $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
+  #$form->{todate}= $locale->date(\%myconfig, $form->{todate}, 0, 0, 0);
+  USTVA->ustva(\%myconfig, \%$form);
 
   #??($form->{department}) = split /--/, $form->{department};
 
@@ -1013,8 +1016,10 @@ sub generate_ustva {
     $form->{br}      = '\\\\';
 
     
-    my @numbers = qw(51r 86r 97r 93r 96 43 45
-      66 62 67);
+    my @numbers = qw(511 861 36 80 971 931 98 96 53 74
+                     85 65 66 61 62 Z67 63 64 59 69 39 83
+                     Z43 Z45 Z53 Z62 Z65);
+      
     my $number = '';
     # Zahlenformatierung für Latex USTVA Formulare
     if ($myconfig{numberformat} eq '1.000,00' or 
diff --git a/doc/ustva.html b/doc/ustva.html
index e0c6b7366..a25a04a85 100755
--- a/doc/ustva.html
+++ b/doc/ustva.html
@@ -211,7 +211,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p>
 </tr>
 <tr class="listrow0">
  <td>51r</td>
- <td></td>
+ <td><%511%></td>
  <td>
    <%51r%>
  </td>
@@ -254,7 +254,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p>
 </tr>
 <tr class="listrow1">
  <td>86r </td>
- <td> </td>
+ <td><%861%> </td>
  <td><%86r%> </td>
 </tr>
 <tr class="listrow0">
@@ -273,7 +273,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p>
 </tr>
 <tr class="listrow0">
  <td>93r </td>
- <td> </td>
+ <td><%931%> </td>
  <td><%93r%> </td>
 </tr>
 <tr class="listrow1">
@@ -297,7 +297,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p>
 </tr>
 <tr class="listrow0">
  <td>97r </td>
- <td> </td>
+ <td><%971%> </td>
  <td><%97r%> </td>
 </tr>
 </table>
diff --git a/sql/Germany-DATEV-SKR03EU-chart.sql b/sql/Germany-DATEV-SKR03EU-chart.sql
index edf5dc706..602c2d0fb 100644
--- a/sql/Germany-DATEV-SKR03EU-chart.sql
+++ b/sql/Germany-DATEV-SKR03EU-chart.sql
@@ -1,3 +1,6 @@
+-- created by Yvonne Einberger
+-- contributed by Andre Schubert
+-- 
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0027', 'EDV-Software', 'A', 'A', 'AP_amount', '0027', 9, NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0090', 'Geschäftsbauten', 'A', 'A', 'AP_amount', '0090', 9, NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0200', 'Techn.Anlagen und Maschinen', 'A', 'A', 'AP_amount', '0200', 9, NULL, NULL, NULL, NULL, FALSE);
@@ -191,8 +194,8 @@ INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, ta
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0650', 'Vblk.geg.Kreditinst.- Restlaufzeit grösser als 5 Jahre', 'A', 'A', '', '0650', 0, NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4510', 'Kfz-Steuer', 'A', 'E', 'AP_amount', '4510', 0, NULL, 19, NULL, 15, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4520', 'Kfz-Versicherungen', 'A', 'E', 'AP_amount', '4520', 0, NULL, 14, NULL, 16, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1771', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1771', 0, NULL, NULL, NULL, 5, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1775', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1775', 0, NULL, NULL, NULL, 6, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1771', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1771', 861, NULL, NULL, NULL, 5, FALSE);
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1775', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1775', 511, NULL, NULL, NULL, 6, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1767', 'Im anderen EG-Staat steuerpfl. Lieferung', 'A', ' ', '', '1767', 10, NULL, 0, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0853', 'Satzungsm.Rücklagen 0% Vorbelast.(st.Einlagekto.)', 'A', 'Q', '', '0853', 0, NULL, NULL, NULL, NULL, FALSE);
 INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1607', 'Vblk.a.LuL ohne Vorsteuer (EÜR)', 'A', 'L', 'AP', '1607', 0, NULL, NULL, NULL, NULL, FALSE);
diff --git a/sql/Pg-upgrade-2.1.1-2.1.2.sql b/sql/Pg-upgrade-2.1.1-2.1.2.sql
index 91016951b..5800d73c7 100644
--- a/sql/Pg-upgrade-2.1.1-2.1.2.sql
+++ b/sql/Pg-upgrade-2.1.1-2.1.2.sql
@@ -235,10 +235,16 @@ ALTER TABLE invoice ADD column pricegroup_id integer;
 ALTER TABLE orderitems ADD column pricegroup_id integer;
 
 update defaults set version = '2.1.2', audittrail = 't';
---
 
--- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
+-- USTVA Update solve Bug 49 conributed by Andre Schubert
+update chart set pos_ustva='861' where accno='1771';
+update chart set pos_ustva='511' where accno='1775';
+update chart set pos_ustva='511' where pos_ustva='51r';
+update chart set pos_ustva='861' where pos_ustva='86r';
+update chart set pos_ustva='971' where pos_ustva='97r';
+update chart set pos_ustva='931' where pos_ustva='93r';
 
+-- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
 alter table orderitems add column ordnumber text;
 alter table orderitems add column transdate text;
 alter table orderitems add column cusordnumber text;
diff --git a/sql/liste.sql b/sql/liste.sql
index ba9285265..1da446b87 100644
--- a/sql/liste.sql
+++ b/sql/liste.sql
@@ -83,7 +83,7 @@ UPDATE chart set taxkey_id=0, pos_eur=31 WHERE accno='4396';
 UPDATE chart set taxkey_id=0, pos_eur=31 WHERE accno='4397';
 UPDATE chart set taxkey_id=0, pos_eur=17 WHERE accno='4500';
 UPDATE chart set taxkey_id=9, pos_bwa=14, pos_eur=17 WHERE accno='4530';
-UPDATE chart set taxkey_id=0, pos_ustva=0, pos_bwa=1 WHERE accno='8100';
+UPDATE chart set taxkey_id=0, pos_ustva=48, pos_bwa=1 WHERE accno='8100';
 UPDATE chart set taxkey_id=0, pos_eur=1 WHERE accno='8110';
 UPDATE chart set taxkey_id=2, pos_ustva=86, pos_bwa=1, pos_eur=1 WHERE accno='8300';
 UPDATE chart set taxkey_id=9, pos_bwa=14, pos_eur=17 WHERE accno='4540';
@@ -141,7 +141,7 @@ UPDATE chart set taxkey_id=9, pos_bwa=20, pos_eur=24 WHERE accno='4969';
 UPDATE chart set taxkey_id=0, pos_bwa=20, pos_eur=24 WHERE accno='4970';
 UPDATE chart set taxkey_id=9, pos_bwa=20, pos_eur=24 WHERE accno='4980';
 UPDATE chart set taxkey_id=9, pos_eur=19 WHERE accno='4985';
-UPDATE chart set taxkey_id=0, pos_ustva=48, pos_bwa=1, pos_eur=1 WHERE accno='8120';
+UPDATE chart set taxkey_id=0, pos_ustva=43, pos_bwa=1, pos_eur=1 WHERE accno='8120';
 UPDATE chart set taxkey_id=0, pos_ustva=41, pos_bwa=1, pos_eur=1 WHERE accno='8125';
 UPDATE chart set taxkey_id=0, pos_eur=1 WHERE accno='8130';
 UPDATE chart set taxkey_id=0, pos_eur=1 WHERE accno='8135';
diff --git a/templates/German-ustva-2004.tex b/templates/German-ustva-2004.tex
index b418f069a..405df9e33 100644
--- a/templates/German-ustva-2004.tex
+++ b/templates/German-ustva-2004.tex
@@ -57,13 +57,14 @@
 \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]
+&&&&\\[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}{<%43%>}\\
+\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}\\
@@ -74,11 +75,11 @@
 \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}{<%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}{<%62%>}\\[26.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
+\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}
diff --git a/templates/German-ustva-2005.tex b/templates/German-ustva-2005.tex
index 824ff1e44..7080cf499 100644
--- a/templates/German-ustva-2005.tex
+++ b/templates/German-ustva-2005.tex
@@ -57,16 +57,14 @@
 \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}}
-&&&&\\[35mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[39mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[7.9mm]
+&&&&\\[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}{<%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}\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
 \end{tabular}
 
 \newpage
@@ -74,11 +72,11 @@
 \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}{<%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}{<%62%>}\\[26.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
+\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}
diff --git a/templates/German-ustva-2006.tex b/templates/German-ustva-2006.tex
index 478515c99..5fb8b0e58 100644
--- a/templates/German-ustva-2006.tex
+++ b/templates/German-ustva-2006.tex
@@ -57,16 +57,14 @@
 \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}}
-&&&&\\[38mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[42mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[8.5mm]
+&&&&\\[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}{<%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}\\
+\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
 \end{tabular}
 
 \newpage
@@ -74,11 +72,11 @@
 \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}{<%45%>}\\[48mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[8.9mm]
+\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}{<%62%>}\\[28mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
+\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}
diff --git a/templates/German-ustva.html b/templates/German-ustva.html
index 93501fc87..bbae885e1 100644
--- a/templates/German-ustva.html
+++ b/templates/German-ustva.html
@@ -80,7 +80,53 @@ automatisch berechnet.</small></p>
 <table border="0" cellspacing="2" cellpadding="2">
   <tbody>
     <tr>
-      <td class="text"><b class="h3">Steuerpflichtige Ums&auml;tze</b></td>
+      <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="text">???</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">???</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="text">???</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">???</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="text">Steuerfreie Ums&auml;tze ohne
+Vorsteuerabzug. </b><br />Umsätze nach § 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>
     <tr>
@@ -88,41 +134,77 @@ automatisch berechnet.</small></p>
       <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"><%51r%></td>
+      <td class="betrag"><%511%></td>
     </tr>
     <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"><%86r%></td>
+      <td class="betrag"><%861%></td>
+    </tr>
+    <tr>
+      <td class="text">andere Steuersä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">???</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="text">???</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">Steuerpflichtige innergemeinsachftliche Erwerbe</b></td>
+      <td class="text"><b class="h3">Innergemeinsachftliche Erwerbe</b></td>
       <td colspan="4"></td>
     </tr>
+   <tr>
+      <td class="text">???</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>
+
     <tr>
-      <td class="text">zum Steuersatz von 16 v.H.</td>
+      <td class="text">Steuerpflichtige innergemeinsachftliche Erwerbe<br />
+      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"><%97r%></td>
+      <td class="betrag"><%971%></td>
     </tr>
     <tr>
       <td class="text">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"><%93r%></td>
+      <td class="betrag"><%931%></td>
     </tr>
+    <tr>
+      <td class="text">???</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="text">&nbsp;</td><td colspan="4"></td></tr>
 
     <tr>
-      <td class="text"><b class="h3">neuer Fahrzeuge von Lieferern</b><br/>
+      <td class="text"><b class="h4">neuer Fahrzeuge von Lieferern</b><br/>
              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>
@@ -130,26 +212,78 @@ automatisch berechnet.</small></p>
       <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">???</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="text">???</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>
+   <tr>
+      <td class="text">???</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"><%43%></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"><%45%></td>
+      <td class="betrag"><%Z45%></td>
+    </tr>
+
+    <tr>
+      <td class="text">???</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">???</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="text">???</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">???</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="text" colspan="3"><b class="h3">Umsatzsteuer</td>
       <td class="zeile"><span class="nodis">(</span>Zeile 53<span class="nodis">)</span></td>
-      <td class="betrag"><%43%></td>
+      <td class="betrag"><%Z53%></td>
     </tr>
 
     <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
@@ -165,13 +299,46 @@ automatisch berechnet.</small></p>
       <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">&nbsp;</td><td colspan="2"></td></tr>
+    <tr>
+      <td class="text" colspan="3">???</td>
+      <td class="spalte ausfuellen">61</td>
+      <td class="betrag ausfuellen"><%61%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</td>
+      <td class="spalte ausfuellen">62</td>
+      <td class="betrag ausfuellen"><%62%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</td>
+      <td class="spalte ausfuellen">67</td>
+      <td class="betrag ausfuellen"><%67%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</td>
+      <td class="spalte ausfuellen">63</td>
+      <td class="betrag ausfuellen"><%63%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</td>
+      <td class="spalte ausfuellen">64</td>
+      <td class="betrag ausfuellen"><%64%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</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"><%62%></td>
+      <td class="betrag"><%Z62%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</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>
@@ -179,7 +346,12 @@ automatisch berechnet.</small></p>
     <tr>
       <td class="text" 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"><%65%></td>
+      <td class="betrag"><%Z65%></td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">???</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>
@@ -187,8 +359,8 @@ automatisch berechnet.</small></p>
     <tr class="noborder">
       <td class="text" colspan="3"><u>Verbleibende Umsatzsteuer-Vorauszahlung</u><br/>
                                       Verbleibender &Uuml;berschuss</td>
-      <td class="zeile"><span class="nodis">(</span>Zeile 67<span class="nodis">)</span></td>
-      <td class="summe"><%67%></td>
+      <td class="spalte ausfuellen">83</td>
+      <td class="summe"><%83%></td>
     </tr>
 
   </tbody>
-- 
2.20.1