X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=8d05927187586122d8c7f39e52cd3b826a510120;hb=a200453a04fc89fdf02dbe39e1d951cb1b55191c;hp=acab5dfb658526f4bbf6df3875fd73fede0f06c4;hpb=18942bd70d66bd2348c6550887bc2994dfcaf358;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index acab5dfb6..8d0592718 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';
@@ -88,7 +89,7 @@ sub report {
$form->header;
# Einlesen der Finanzamtdaten
- &get_config($userspath, 'finanzamt.ini');
+ USTVA->get_config($userspath, 'finanzamt.ini');
# Hier Einlesen der user-config
# steuernummer entfernt für prerelease
@@ -112,7 +113,7 @@ sub report {
my $company_given = ($form->{company} ne '')
? qq|
$form->{company}
\n|
- : qq|{path}&action=config|
+ : qq|{login}|
. qq|&password=$form->{password}>|
. $locale->text('No Company Name given') . qq|!
|;
@@ -138,7 +139,7 @@ sub report {
? qq|$form->{co_street}
|
. qq|$form->{co_street1}
|
. qq|$form->{co_zip} $form->{co_city}|
- : qq|{path}&action=config|
+ : qq|{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|{login}|
. qq|&password=$form->{password}">Keine Steuernummer hinterlegt!|
. qq|
|;
@@ -241,7 +242,7 @@ sub show {
#&generate_ustva();
no strict 'refs';
$lxdebug->leave_sub();
- &{ $form->{nextsub} };
+ call_sub($form->{"nextsub"});
use strict 'refs';
}
@@ -528,10 +529,9 @@ sub show_options {
sub generate_ustva {
$lxdebug->enter_sub();
- # Aufruf von get_config aus bin/mozilla/ustva.pl zum
- # Einlesen der Finanzamtdaten aus finanzamt.ini
+ # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini
- get_config($userspath, 'finanzamt.ini');
+ USTVA->get_config($userspath, 'finanzamt.ini');
# init some form vars
my @anmeldungszeitraum =
@@ -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} = [];
@@ -1056,7 +1062,7 @@ sub config_step1 {
# edit all taxauthority prefs
$form->header;
- &get_config($userspath, 'finanzamt.ini');
+ USTVA->get_config($userspath, 'finanzamt.ini');
my $land = $form->{elsterland};
my $amt = $form->{elsterFFFF};
@@ -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) {
@@ -1145,7 +1149,7 @@ sub config_step2 {
my $elster_amt = '';
my $elsterFFFF = '';
my $elstersteuernummer = '';
- &get_config($userspath, 'finanzamt.ini')
+ USTVA->get_config($userspath, 'finanzamt.ini')
if ($form->{saved} eq $locale->text('saved'));
# Auf Übergabefehler checken
@@ -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
@@ -1312,39 +1316,6 @@ sub create_steuernummer {
$lxdebug->leave_sub();
}
-sub get_config {
- $lxdebug->enter_sub();
-
- my ($userpath, $filename) = @_;
- my ($key, $value) = '';
- open(FACONF, "$userpath/$form->{login}_$filename")
- or #falls Datei nicht vorhanden ist
- sub {
- open(FANEW, ">$userpath/$form->{login}_$filename")
- or $form->error("$userpath/$filename : $!");
- close FANEW;
- open(FACONF, "$userpath/$form->{login}_$filename")
- or $form->error("$userpath/$form->{username}_$filename : $!");
- };
- while () {
- last if /^\[/;
- next if /^(#|\s)/;
-
- # remove comments
- s/\s#.*//g;
-
- # remove any trailing whitespace
- s/^\s*(.*?)\s*$/$1/;
- ($key, $value) = split /=/, $_, 2;
-
- $form->{$key} = "$value";
-
- }
- close FACONF;
-
- $lxdebug->leave_sub();
-}
-
sub save {
$lxdebug->enter_sub();
my $filename = "$form->{login}_$form->{filename}";
@@ -1411,14 +1382,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();
}