X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fustva.pl;h=d7ef9caeb7a188d04a544ad2c65c0ddd4de9379b;hb=6cbeab9a2d7691fa8fb69faab3f21a662df8740f;hp=acab5dfb658526f4bbf6df3875fd73fede0f06c4;hpb=18942bd70d66bd2348c6550887bc2994dfcaf358;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index acab5dfb6..d7ef9caeb 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/common.pl";
#use strict;
#no strict 'refs';
@@ -68,13 +68,13 @@ use SL::User;
# $locale->text('Nov')
# $locale->text('Dec')
-# $form->parse_html_template('generic/util_hidden_variables');
-
#############################
sub report {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
my $myconfig = \%myconfig;
$form->{title} = $locale->text('UStVA');
@@ -88,7 +88,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,9 +112,8 @@ sub report {
my $company_given = ($form->{company} ne '')
? qq|
$form->{company}
\n|
- : qq|{path}&action=config|
- . qq|&level=Programm--Preferences&login=$form->{login}|
- . qq|&password=$form->{password}>|
+ : qq||
. $locale->text('No Company Name given') . qq|!
|;
@@ -138,9 +137,8 @@ sub report {
? qq|$form->{co_street}
|
. qq|$form->{co_street1}
|
. qq|$form->{co_zip} $form->{co_city}|
- : qq|{path}&action=config|
- . qq|&level=Programm--Preferences&login=$form->{login}|
- . qq|&password=$form->{password}>|
+ : qq||
. $locale->text('No Company Address given')
. qq|!\n|;
@@ -151,9 +149,8 @@ sub report {
my $taxnumber_given = ($form->{steuernummer} ne '')
? qq|$form->{steuernummer}|
- : qq|{login}|
- . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!|
+ : qq|Keine Steuernummer hinterlegt!|
. qq|
|;
my $ustva_vorauswahl = &ustva_vorauswahl();
@@ -196,12 +193,16 @@ sub report {
}
];
+ # Which COA is in use?
+ USTVA->get_coa($form, $myconfig);
+
my $template_ref = {
openings => $openings,
company_given => $company_given,
address_given => $address_given,
taxnumber_given => $taxnumber_given,
+ taxnumber => $myconfig->{taxnumber},
select_year => $select_year,
period_local => $period_local,
method_local => $method_local,
@@ -209,6 +210,7 @@ sub report {
checkbox_kz_10 => $checkbox_kz_10,
tax_office_banks => $tax_office_banks_ref,
select_options => &show_options,
+
};
print($form->parse_html_template('ustva/report', $template_ref));
@@ -223,6 +225,8 @@ sub report {
sub help {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
# parse help documents under doc
my $tmp = $form->{templates};
$form->{templates} = 'doc';
@@ -238,16 +242,20 @@ sub help {
sub show {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
#&generate_ustva();
no strict 'refs';
$lxdebug->leave_sub();
- &{ $form->{nextsub} };
+ call_sub($form->{"nextsub"});
use strict 'refs';
}
sub ustva_vorauswahl {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
my $select_vorauswahl;
#Aktuelles Datum zerlegen:
@@ -484,6 +492,8 @@ sub debug {
sub show_options {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
# $form->{PD}{$form->{type}} = "selected";
# $form->{DF}{$form->{format}} = "selected";
# $form->{OP}{$form->{media}} = "selected";
@@ -528,10 +538,11 @@ 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
+ $auth->assert('advance_turnover_tax_return');
- get_config($userspath, 'finanzamt.ini');
+ # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini
+
+ USTVA->get_config($userspath, 'finanzamt.ini');
# init some form vars
my @anmeldungszeitraum =
@@ -754,18 +765,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} = [];
@@ -827,9 +844,10 @@ sub generate_ustva {
$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
@@ -849,28 +867,25 @@ sub generate_ustva {
# 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
@@ -879,6 +894,7 @@ sub generate_ustva {
$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
@@ -1000,39 +1016,44 @@ sub generate_ustva {
exit(0);
}
- # Austria
- } elsif ($form->{coa} eq 'Austria') {
-
- #
- # Outputformat specific customisation's
- #
-
- my @category_euro = 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
- 41 44 49 43 48 51 86 35 77 76 91 89
- 97 93 95 94 42 60 45 52 73 84 81
- );
-
-
- if ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
-
- $form->{IN} = $form->{type} . '.html';
- $form->{padding} = " ";
- $form->{bold} = "";
- $form->{endbold} = "";
- $form->{br} = "
";
- $form->{address} =~ s/\\n/\n/g;
-
- foreach $number (@category_euro) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
+
+ } else # Outputformat for generic output
+ {
+
+ my @category_cent = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '2',
+ });
+
+ my @category_euro = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '0',
+ });
+
+ $form->{USTVA} = [];
+
+ if ( $form->{format} eq 'generic') { # Formatierungen für HTML Ausgabe
+
+ my $rec_ref = {};
+ for my $kennziffer (@category_cent, @category_euro) {
+ $rec_ref = {};
+ $rec_ref->{id} = $kennziffer;
+ $rec_ref->{amount} = $form->format_amount(\%myconfig, $form->{$kennziffer}, 2, '0');
+
+ $lxdebug->message($LXDebug::DEBUG, "Kennziffer $kennziffer: '$form->{$kennziffer}'" );
+ $lxdebug->dump($LXDebug::DEBUG, $rec_ref );
+ push @ { $form->{USTVA} }, $rec_ref;
}
+
}
-
- }
- # end nation specific customisations
+ }
if ( $form->{period} eq '13' and $form->{format} ne 'html') {
$form->header;
@@ -1045,7 +1066,22 @@ sub generate_ustva {
$form->{templates} = $myconfig{templates};
$form->{templates} = "doc" if ( $form->{type} eq 'help' );
- $form->parse_template(\%myconfig, $userspath);
+ if ($form->{format} eq 'generic'){
+
+ $form->header();
+
+ $template_ref = {
+ taxnumber => $myconfig{taxnumber},
+ };
+
+ print($form->parse_html_template('ustva/generic_taxreport', $template_ref));
+
+ } else
+ {
+
+ $form->parse_template(\%myconfig, $userspath);
+
+ }
$lxdebug->leave_sub();
}
@@ -1053,24 +1089,17 @@ sub generate_ustva {
sub config_step1 {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
# 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};
- if ($form->{cbscript} ne '' and $form->{cblogin} ne '') {
- $callback = qq|$form->{cbscript}|
- .qq|?action="config_step1"|
- .qq|&login="$form->{cblogin}"|
- .qq|&path="$form->{cbpath}"|
- .qq|&root="$form->{cbroot}"|
- .qq|&rpw="$form->{cbrpw}"|;
- }
-
$form->{title} = $locale->text('Tax Office Preferences');
@@ -1103,8 +1132,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
);
foreach my $variable (@_hidden_form_variables) {
@@ -1112,6 +1140,10 @@ sub config_step1 {
{ 'variable' => $variable, 'value' => $form->{$variable} };
}
+# Which COA is in use?
+
+ USTVA->get_coa($form, \%myconfig);
+
# hä? kann die weg?
my $steuernummer_new = '';
@@ -1135,6 +1167,9 @@ sub config_step1 {
sub config_step2 {
$lxdebug->enter_sub();
+
+ $auth->assert('advance_turnover_tax_return');
+
$form->header();
# print qq|
@@ -1145,7 +1180,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,14 +1283,11 @@ sub config_step2 {
FA_steuerberater_city FA_steuerberater_tel
FA_voranmeld method
FA_dauerfrist FA_71
- elster path
- login password
+ elster
type elster_init
saved callback
);
-
-
foreach my $variable (@_hidden_form_variables) {
push @{ $_hidden_variables_ref},
{ 'variable' => $variable, 'value' => $form->{$variable} };
@@ -1278,6 +1310,9 @@ sub config_step2 {
sub create_steuernummer {
$lxdebug->enter_sub();
+
+ $auth->assert('advance_turnover_tax_return');
+
my $part = $form->{part};
my $patterncount = $form->{patterncount};
my $delimiter = $form->{delimiter};
@@ -1312,42 +1347,13 @@ sub create_steuernummer {
$lxdebug->leave_sub();
}
-sub get_config {
+sub save {
$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;
+ $auth->assert('advance_turnover_tax_return');
- $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();
@@ -1373,27 +1379,29 @@ sub save {
# 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 {
@@ -1411,19 +1419,22 @@ 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();
}
sub elster_hash {
$lxdebug->enter_sub();
+
+ $auth->assert('advance_turnover_tax_return');
+
my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form);
$lxdebug->leave_sub();
return $finanzamt;