# 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';
$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
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>|;
? 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')
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>|;
#&generate_ustva();
no strict 'refs';
$lxdebug->leave_sub();
- &{ $form->{nextsub} };
+ call_sub($form->{"nextsub"});
use strict 'refs';
}
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 =
# 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} = [];
$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
# 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
$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
# 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};
$callback = qq|$form->{cbscript}|
.qq|?action="config_step1"|
.qq|&login="$form->{cblogin}"|
- .qq|&path="$form->{cbpath}"|
.qq|&root="$form->{cbroot}"|
.qq|&rpw="$form->{cbrpw}"|;
}
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) {
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
FA_steuerberater_city FA_steuerberater_tel
FA_voranmeld method
FA_dauerfrist FA_71
- elster path
+ elster
login password
type elster_init
saved callback
$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 (<FACONF>) {
- 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}";
+ $filename =~ s|.*/||;
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
create_steuernummer();
# 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 {
# 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();
}
projects / kivitendo-erp.git / blobdiff