X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=b7b66fbbcf4bc40b4ebdbd5d7c5ca5d24c51cfbe;hb=8365e092eb2088a8c2ebba604783555a13dc2a57;hp=3e353e832d3d4a841f245a974eee02971c30afad;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 3e353e832..b7b66fbbc 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -754,18 +754,24 @@ 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  811  891  Z43  Z45  Z53  Z62  Z65  Z67
-      
-    );
-
-    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 
-    );
+    my @category_cent = USTVA->report_variables({
+        myconfig    => \%myconfig,
+        form        => $form,
+        type        => '',
+        attribute   => 'position',
+        dec_places  => '2',
+    });
     
+    push @category_cent, qw(83  Z43  Z45  Z53  Z62  Z65  Z67);
+
+    my @category_euro = USTVA->report_variables({
+        myconfig    => \%myconfig,
+        form        => $form,
+        type        => '',
+        attribute   => 'position',
+        dec_places  => '0',
+    });
+
     $form->{id} = [];
     $form->{amount} = [];
 
@@ -827,9 +833,10 @@ sub generate_ustva {
       $file .= $form->{elstersteuernummer};
       #file suffix
       $file .= '.xml';
+      $file =~ s|.*/||;
       $form->{tmpfile} = "$userspath/$file";
 
-      $form->{attachment_filename} = "$file";
+      $form->{attachment_filename} = $file;
    
       # Zahlenformatierung für Winston
 
@@ -849,28 +856,25 @@ sub generate_ustva {
       # Re-set Numberformat
       $myconfig{numberformat} = $temp_numberformat;
 
-
       # push Kennziffern to <%foreach Array fo easyer
       # output in xml format. Thx to Moritz.
       my %winston_id_for = (
-       # No Winston remap?!
+         # No Winston remap?!
       );
-            
 
       foreach my $kennziffer (@category_cent, @category_euro) {
-
+      
         next if ( $kennziffer =~ m/Z\d\d/);
         next if (   $form->{$kennziffer} == 0 );
         
         if (defined $winston_id_for{$kennziffer} ) {
           push(@{ $form->{id}}, $winston_id_for{$kennziffer});
         } else {
-          push(@{ $form->{id}}, "$kennziffer"); 
+          push(@{ $form->{id}}, "Kz$kennziffer"); 
         }
         push(@{ $form->{amount}}, $form->{$kennziffer});
       }    
 
-
     } elsif ( $form->{format} eq 'elstertaxbird' ) {
 
       # Define serveral filenames
@@ -879,6 +883,7 @@ sub generate_ustva {
       $form->{attachment_filename} = "USTVA-" . $form->{period} 
       . sprintf("%02d", $form->{year} % 100) . ".txb";
       
+      $form->{attachment_filename} =~ s|.*/||;
       $form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
 
       # TODO: set Output to UTF-8 or system Preference
@@ -1312,7 +1317,9 @@ sub create_steuernummer {
 
 sub save {
   $lxdebug->enter_sub();
+
   my $filename = "$form->{login}_$form->{filename}";
+  $filename =~ s|.*/||;
 
   #zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
   create_steuernummer();
@@ -1338,27 +1345,29 @@ sub save {
 
   # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
   if ($form->{elstersteuernummer} ne '000000000') {
+    
     $form->{elster} = '1';
-    open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
+    
+    open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
 
     # create the config file
-    print CONF qq|# Configuration file for USTVA\n\n|;
+    print {$ustvaconfig} qq|# Configuration file for USTVA\n\n|;
     my $key = '';
     foreach $key (sort @config) {
       $form->{$key} =~ s/\\/\\\\/g;
       # strip M
       $form->{$key} =~ s/\r\n/\n/g;
 
-      print CONF qq|$key=|;
+      print {$ustvaconfig} qq|$key=|;
       if ($form->{$key} ne 'Y') {
-        print CONF qq|$form->{$key}\n|;
+        print {$ustvaconfig} qq|$form->{$key}\n|;
       }
       if ($form->{$key} eq 'Y') {
-        print CONF qq|checked \n|;
+        print {$ustvaconfig} qq|checked \n|;
       }
     }
-    print CONF qq|\n\n|;
-    close CONF;
+    print {$ustvaconfig} qq|\n\n|;
+    close $ustvaconfig;
     $form->{saved} = $locale->text('saved');
 
   } else {