X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=3e353e832d3d4a841f245a974eee02971c30afad;hb=6bad0469c4f5bb92830f77cf7675e76730e79ae4;hp=fc1b5e126d0f51351ccdea1a4d20497f2441c249;hpb=0246e1250d5b6740e6ac04458714a57393bff4f8;p=kivitendo-erp.git

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index fc1b5e126..3e353e832 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -24,7 +24,8 @@
 # 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;
 #no strict 'refs';
@@ -112,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>|;
@@ -138,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') 
@@ -151,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>|;
@@ -241,7 +242,7 @@ sub show {
   #&generate_ustva();
   no strict 'refs';
   $lxdebug->leave_sub();
-  &{ $form->{nextsub} };
+  call_sub($form->{"nextsub"});
   use strict 'refs';
 }
 
@@ -1065,7 +1066,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}"|;
   }
@@ -1102,8 +1102,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) {
@@ -1247,7 +1246,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
@@ -1377,14 +1376,14 @@ sub continue {
 
   # allow Symbolic references just here:
   no strict 'refs';
-  &{ $form->{nextsub} };
+  call_sub($form->{"nextsub"});
   use strict 'refs';
   $lxdebug->leave_sub();
 }
 
 sub back {
   $lxdebug->enter_sub();
-  &{ $form->{lastsub} };
+  call_sub($form->{"lastsub"});
   $lxdebug->leave_sub();
 }