USTVA: Winston export ueberarbeitet. Kz vor die pos_ustva gesetzt, 'Kennzahl Nr'...

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index e072b27fdecab5e331c94e7ab73fc62d75323592..679c7d1378accf70e69351d4a453ea23140353f2 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -855,28 +855,25 @@ sub generate_ustva {
       # Re-set Numberformat
       $myconfig{numberformat} = $temp_numberformat;
 
       # 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 = (
       # 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) {
 
       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 {
         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});
       }    
 
         }
         push(@{ $form->{amount}}, $form->{$kennziffer});
       }    
 

-

     } elsif ( $form->{format} eq 'elstertaxbird' ) {
 
       # Define serveral filenames
     } elsif ( $form->{format} eq 'elstertaxbird' ) {
 
       # Define serveral filenames

diff --git a/templates/German-winston.xml b/templates/German-winston.xml
index 00a3bb721f35fca7d872f2558b89a5458027b886..1b8e92408b7a506b25543b10d945b271d9641795 100644 (file)
--- a/templates/German-winston.xml
+++ b/templates/German-winston.xml
@@ -7,7 +7,7 @@
   <AnmeldeZeitraum><%period%></AnmeldeZeitraum>
 
 <%foreach id%>
   <AnmeldeZeitraum><%period%></AnmeldeZeitraum>
 
 <%foreach id%>

-  <Kennzahl Nr="<%id%>"><%amount%></Kennzahl>
+  <Kennzahl nr="<%id%>"><%amount%></Kennzahl>

 <%end%>
 
 </WinstonAusgang>
 <%end%>
 
 </WinstonAusgang>