From 785ef602f0f48db5ebc7f29c621b24277a71d0fe Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Tue, 6 Feb 2007 07:04:52 +0000 Subject: [PATCH] =?utf8?q?Kennziffern=20hinzugef=C3=BCgt,=20Berechnungen?= =?utf8?q?=20der=20Zwischensummen=20verbessert,=20Code=20aufschoenen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/USTVA.pm | 36 +++++++++++++++++++++--------------- bin/mozilla/ustva.pl | 22 ++++++++++++---------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/SL/USTVA.pm b/SL/USTVA.pm index 4287c3135..09f56836a 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -573,16 +573,16 @@ sub ustva { my $last_period = 0; my $category = "pos_ustva"; my @category_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 + 511 861 36 80 971 931 98 96 53 74 + 85 65 66 61 62 67 63 64 59 69 + 39 83 811 891 Z43 Z45 Z53 Z62 Z65 Z67 ); my @category_euro = qw( 41 44 49 43 48 51 86 35 77 76 91 97 93 95 94 42 60 45 - 52 73 84 + 52 73 84 81 89 ); $form->{decimalplaces} *= 1; @@ -598,24 +598,30 @@ sub ustva { $form, $category); # - # Berechnung der USTVA Formularfelder + # Berechnung der USTVA Formularfelder laut Bogen 207 # $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->{"Z43"} = $form->{"511"} + $form->{"811"} + $form->{"861"} + + $form->{"36"} + $form->{"80"} + $form->{"971"} + + $form->{"891"} + $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"}; - # Hier fehlen moeglicherweise noch einige Berechnungen! + + $form->{"Z53"} = $form->{"Z45"} + $form->{"53"} + $form->{"74"} + + $form->{"85"} + $form->{"65"}; + + $form->{"Z62"} = $form->{"Z43"} - $form->{"66"} - $form->{"61"} + - $form->{"62"} - $form->{"67"} - $form->{"63"} + - $form->{"64"} - $form->{"59"}; + + $form->{"Z65"} = $form->{"Z62"} - $form->{"69"}; + $form->{"83"} = $form->{"Z65"} - $form->{"39"}; $dbh->disconnect; diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 3b799e6e0..de1de620d 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -739,14 +739,15 @@ sub generate_ustva { # my @category_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 + 511 861 36 80 971 931 98 96 53 74 + 85 65 66 61 62 67 63 64 59 69 + 39 83 811 891 Z43 Z45 Z53 Z62 Z65 Z67 + ); my @category_euro = qw( - 41 44 49 43 48 51 86 35 77 76 91 - 97 93 95 94 42 60 45 52 73 84 + 41 44 49 43 48 51 86 35 77 76 91 89 + 97 93 95 94 42 60 45 52 73 84 81 ); if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') { @@ -1259,11 +1260,12 @@ sub save { $form->{FA_Internet} =~ s/^http:\/\///; $form->{FA_Internet} = 'http://' . $form->{FA_Internet}; - my @config = qw(elster elsterland elstersteuernummer steuernummer - elsteramt elsterFFFF FA_Name FA_Strasse - FA_PLZ FA_Ort FA_Telefon FA_Fax FA_PLZ_Grosskunden - FA_PLZ_Postfach FA_Postfach FA_BLZ_1 FA_Kontonummer_1 - FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2 + my @config = qw( + elster elsterland elstersteuernummer steuernummer + elsteramt elsterFFFF FA_Name FA_Strasse + FA_PLZ FA_Ort FA_Telefon FA_Fax + FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach FA_BLZ_1 + FA_Kontonummer_1 FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name FA_steuerberater_street FA_steuerberater_city FA_steuerberater_tel -- 2.20.1