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

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

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index a3c464211291196fe8a730d0650d7b4379790b0e..89818c93c91a38dac0a12c239a5beb3cf93d9830 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -855,9 +855,9 @@ sub generate_ustva {
 
       my $temp_numberformat = $myconfig{numberformat};
 
-      # Numberformat must be '1000.00' for Winston
+      # Numberformat must be '1000,00' for Winston
 
-      $myconfig{numberformat} = '1000.00';
+      $myconfig{numberformat} = '1000,00';
 
       foreach my $number (@category_cent) {
         $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
@@ -1222,11 +1222,7 @@ sub config_step2 {
     create_steuernummer();
 
     # rebuild elster_amt
-    my $amt = '';
-    foreach $amt (keys %{ $elster_init{ $form->{elsterland} } }) {
-      $elster_amt = $amt
-        if ($elster_init{ $form->{elsterland}{$amt} eq $form->{elsterFFFF} });
-    }
+    my $amt = $elster_init{$elsterFFFF};
 
     # load the predefined hash data into the FA_* Vars
     my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort