X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fustva.pl;h=8d05927187586122d8c7f39e52cd3b826a510120;hb=fec0904532e2136a1a769f568c351f4875257d56;hp=8a5be4396b1367e5996bf0f19681c3fd69fff7b1;hpb=40782548cf82ac1e4c0fe417113a4cb3072e9390;p=kivitendo-erp.git

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 8a5be4396..8d0592718 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -24,7 +24,7 @@
 # German Tax authority Module and later ELSTER Interface
 #======================================================================
 
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 
 #use strict;
@@ -113,7 +113,7 @@ sub report {
 
   my $company_given = ($form->{company} ne '') 
     ? qq|<h3>$form->{company}</h3>\n|
-    : qq|<a href=am.pl?path=$form->{path}&action=config|
+    : qq|<a href=am.pl?action=config|
       . qq|&level=Programm--Preferences&login=$form->{login}|
       . qq|&password=$form->{password}>| 
       . $locale->text('No Company Name given') . qq|!</a><br>|;
@@ -139,7 +139,7 @@ sub report {
     ? qq|$form->{co_street}<br>|
         . qq|$form->{co_street1}<br>|
         . qq|$form->{co_zip} $form->{co_city}|
-    : qq|<a href=am.pl?path=$form->{path}&action=config|
+    : qq|<a href=am.pl?action=config|
         . qq|&level=Programm--Preferences&login=$form->{login}|
         . qq|&password=$form->{password}>| 
         . $locale->text('No Company Address given') 
@@ -152,7 +152,7 @@ sub report {
 
   my $taxnumber_given = ($form->{steuernummer} ne '')
     ? qq|$form->{steuernummer}|
-    : qq|<a href="ustva.pl?path=$form->{path}&action="config_step1"|
+    : qq|<a href="ustva.pl?action="config_step1"|
       . qq|&level=Programm--Finanzamteinstellungen&login=$form->{login}|
       . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!|
       . qq|</a><br>|;
@@ -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} = [];
 
@@ -1066,7 +1072,6 @@ sub config_step1 {
     $callback =  qq|$form->{cbscript}|
                 .qq|?action="config_step1"|
                 .qq|&login="$form->{cblogin}"|
-                .qq|&path="$form->{cbpath}"|
                 .qq|&root="$form->{cbroot}"|
                 .qq|&rpw="$form->{cbrpw}"|;
   }
@@ -1103,8 +1108,7 @@ sub config_step1 {
     FA_BLZ_2            FA_Kontonummer_2  FA_Bankbezeichnung_oertlich
     FA_Oeffnungszeiten  FA_Email          FA_Internet
     steuernummer        elsterland        elstersteuernummer
-    elsterFFFF          path              login
-    password
+    elsterFFFF          login             password
   );
 
   foreach my $variable (@_hidden_form_variables) {
@@ -1248,7 +1252,7 @@ sub config_step2 {
     FA_steuerberater_city   FA_steuerberater_tel
     FA_voranmeld            method
     FA_dauerfrist           FA_71 
-    elster                  path 
+    elster                  
     login                   password 
     type                    elster_init 
     saved                   callback