Kennziffern hinzugefügt, Berechnungen der Zwischensummen verbessert,

[mfinanz.git] / bin / mozilla / ustva.pl

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index daecb8d88af648e8e8847758916dc96a6bf1b273..de1de620d29c5dd8c07e3ea590d3780e99d65c2a 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -738,12 +738,17 @@ sub generate_ustva {
   # Outputformat specific customisation's
   #
 
-  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);
+  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  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);
+  my @category_euro = qw(
+    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') {
 
@@ -829,6 +834,7 @@ sub generate_ustva {
 
   elsif ( $form->{format} eq 'elstertaxbird' ) {
 
+    # Define serveral filenames
     $form->{IN} = 'taxbird.txb';
 
     $form->{attachment_filename} = "USTVA-" . $form->{period} 
@@ -836,6 +842,11 @@ sub generate_ustva {
     
     $form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
 
+    # TODO: set Output to UTF-8 or system Preference
+    #$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8");
+    #my $iconv = $self->{"iconv"};
+    #$iconv->convert($variable);
+
     if ($form->{period} =~ /^[4]\d$/ ){
       my %periods = ( # Lx => taxbird
                    '41' => '12',
@@ -871,8 +882,6 @@ sub generate_ustva {
         $form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land );
       }
       
-
-      
       $form->{co_zip} = $form->{co_city};
       $form->{co_zip} =~ s/\D//g;
       $form->{co_city} =~ s/\d//g;
@@ -887,11 +896,10 @@ sub generate_ustva {
       $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
       
       # Numberformatting for Taxbird
-
       my $temp_numberformat = $myconfig{numberformat};
-      # Numberformat must be '1000.00' for Taxbird ?!
 
-      $myconfig{numberformat} = '1000.00';
+      # Numberformat must be '1000,00' for Taxbird ?!
+      $myconfig{numberformat} = '1000,00';
 
       foreach my $number (@category_cent) {
         $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
@@ -1252,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