X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=cfd78bf7c208154636186eb3675fbc7087fb69e5;hb=429203bfb57dd673aa807d749ab43c8e3332f8c8;hp=e072b27fdecab5e331c94e7ab73fc62d75323592;hpb=468b6bcf141317a5f08cbe632d23758de445bac6;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index e072b27fd..cfd78bf7c 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -1,4 +1,3 @@
-#!/bin/perl
#=====================================================================
# Lx-Office ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
@@ -24,7 +23,6 @@
# German Tax authority Module and later ELSTER Interface
#======================================================================
-require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
#use strict;
@@ -35,6 +33,8 @@ require "bin/mozilla/common.pl";
#our ($myconfig);
#use CGI::Carp "fatalsToBrowser";
+use List::Util qw(first);
+
use SL::PE;
use SL::RP;
use SL::USTVA;
@@ -69,13 +69,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');
@@ -89,20 +89,21 @@ sub report {
$form->header;
# Einlesen der Finanzamtdaten
- USTVA->get_config($userspath, 'finanzamt.ini');
+ my $ustva = USTVA->new();
+ $ustva->get_config($userspath, 'finanzamt.ini');
# Hier Einlesen der user-config
# steuernummer entfernt für prerelease
my @a = qw(
- signature name company address businessnumber
- tel fax email co_chief co_department
+ signature name company address businessnumber
+ tel fax email co_chief co_department
co_custom1 co_custom2 co_custom3 co_custom4 co_custom5
- co_name1 co_name2 co_street co_street1 co_zip
- co_city co_city1 co_country co_tel co_tel1
+ co_name1 co_name2 co_street co_street1 co_zip
+ co_city co_city1 co_country co_tel co_tel1
co_tel2 co_fax co_fax1 co_email co_email1
- co_url co_url1 ustid duns co_bankname
+ co_url co_url1 ustid duns co_bankname
co_bankname1 co_bankname2 co_bankname3 co_blz co_blz1
- co_blz2 co_blz3 co_accountnr co_accountnr1 co_accountnr2
+ co_blz2 co_blz3 co_accountnr co_accountnr1 co_accountnr2
co_accountnr3
);
@@ -111,11 +112,10 @@ sub report {
my $openings = $form->{FA_Oeffnungszeiten};
$openings =~ s/\\\\n/
/g;
- my $company_given = ($form->{company} ne '')
+ my $company_given = ($form->{company} ne '')
? qq|$form->{company}
\n|
- : qq|{login}|
- . qq|&password=$form->{password}>|
+ : qq||
. $locale->text('No Company Name given') . qq|!
|;
@@ -123,26 +123,20 @@ sub report {
# klären, ob $form->{company_street|_address} gesetzt sind
if ($form->{address} ne '') {
my $temp = $form->{address};
- $temp =~ s/\\n/
/;
+ $temp =~ s/\n/
/;
($form->{co_street}, $form->{co_city}) = split("
", $temp);
- $form->{co_city} =~ s/\\n//g;
+ $form->{co_city} =~ s/\n//g;
}
- my $address_given =
- ($form->{co_street} ne ''
- and (
- $form->{co_zip} ne ''
- or $form->{co_city} ne ''
- )
- )
+ my $address_given =
+ ($form->{co_street} && ($form->{co_zip} || $form->{co_city}))
? qq|$form->{co_street}
|
. qq|$form->{co_street1}
|
. qq|$form->{co_zip} $form->{co_city}|
- : qq|{login}|
- . qq|&password=$form->{password}>|
- . $locale->text('No Company Address given')
+ : qq||
+ . $locale->text('No Company Address given')
. qq|!\n|;
$form->{co_email} = $form->{email} unless $form->{co_email};
@@ -150,18 +144,13 @@ sub report {
$form->{co_fax} = $form->{fax} unless $form->{co_fax};
$form->{co_url} = $form->{urlx} unless $form->{co_url};
- my $taxnumber_given = ($form->{steuernummer} ne '')
- ? qq|$form->{steuernummer}|
- : qq|{login}|
- . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!|
- . qq|
|;
+ my $taxnumber_given = ($form->{steuernummer} ne '') ? $form->{steuernummer} : qq|Keine Steuernummer hinterlegt!
|;
my $ustva_vorauswahl = &ustva_vorauswahl();
my @all_years = $form->all_years(\%myconfig);
- my $select_year = qq||;
}
$lxdebug->leave_sub();
-
+
return $select_vorauswahl;
}
@@ -485,6 +485,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";
@@ -511,7 +513,7 @@ sub show_options {
. qq||
. qq||;
+ . qq||;
}
#$format .= qq||;
@@ -522,23 +524,26 @@ sub show_options {
. $locale->text('Choose Outputformat') . qq|">$format
|;
$lxdebug->leave_sub();
-
+
return $show_options;
}
sub generate_ustva {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
# Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini
- USTVA->get_config($userspath, 'finanzamt.ini');
+ my $ustva = USTVA->new();
+ $ustva->get_config($userspath, 'finanzamt.ini');
# init some form vars
my @anmeldungszeitraum =
- qw('0401' '0402' '0403'
- '0404' '0405' '0406'
- '0407' '0408' '0409'
- '0410' '0411' '0412'
+ qw('0401' '0402' '0403'
+ '0404' '0405' '0406'
+ '0407' '0408' '0409'
+ '0410' '0411' '0412'
'0441' '0442' '0443' '0444');
foreach my $item (@anmeldungszeitraum) {
@@ -559,7 +564,7 @@ sub generate_ustva {
#
# using dates in ISO-8601 format: yyyymmmdd for Postgres...
#
-
+
#yearly report
if ($form->{period} eq "13") {
$form->{fromdate} = "$form->{year}0101";
@@ -667,12 +672,12 @@ sub generate_ustva {
};
}
- # Kontrollvariable für die Templates
+ # Kontrollvariable für die Templates
$form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0";
# Get the USTVA
- USTVA->ustva(\%myconfig, \%$form);
+ $ustva->ustva(\%myconfig, \%$form);
# reformat Dates to dateformat
$form->{fromdate} = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
@@ -745,26 +750,26 @@ sub generate_ustva {
# Nation specific customisations
#
################################
-
+
# Germany
-
+
if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU') {
-
+
#
# Outputformat specific customisation's
#
- my @category_cent = USTVA->report_variables({
+ 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({
+ my @category_euro = $ustva->report_variables({
myconfig => \%myconfig,
form => $form,
type => '',
@@ -809,7 +814,7 @@ sub generate_ustva {
foreach $number (@category_cent) {
$form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
}
-
+
foreach $number (@category_euro) {
$form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0');
}
@@ -817,11 +822,11 @@ sub generate_ustva {
} elsif ( $form->{format} eq 'elsterwinston' ) {
$form->{IN} = 'winston.xml';
-
+
#
# Build Winston filename
#
-
+
my $file = 'U'; # 1. char 'U' = USTVA
$file .= $form->{period};
#4. and 5. char = year modulo 100
@@ -833,10 +838,11 @@ sub generate_ustva {
$file .= $form->{elstersteuernummer};
#file suffix
$file .= '.xml';
+ $file =~ s|.*/||;
$form->{tmpfile} = "$userspath/$file";
$form->{attachment_filename} = $file;
-
+
# Zahlenformatierung für Winston
my $temp_numberformat = $myconfig{numberformat};
@@ -848,43 +854,41 @@ sub generate_ustva {
foreach my $number (@category_cent) {
$form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
}
-
+
foreach my $number (@category_euro) {
$form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
}
# 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->{IN} = 'taxbird.txb';
- $form->{attachment_filename} = "USTVA-" . $form->{period}
+ $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
@@ -898,7 +902,7 @@ sub generate_ustva {
'43' => '14',
'44' => '15',
);
-
+
foreach my $quarter ( keys %periods ) {
$form->{taxbird_period} = $periods{$quarter} if ( $form->{period} eq $quarter);
}
@@ -913,42 +917,23 @@ sub generate_ustva {
USTVA::error( $locale->text('Wrong Period' ));
exit(0);
}
-
- my %lands = ( # Lx => taxbird # TODO: besser als array...
- 'Baden Würtemberg' => '0',
- 'Bayern' => '1',
- 'Berlin' => '2',
- 'Brandenburg' => '3',
- 'Bremen' => '4',
- 'Hamburg' => '5',
- 'Hessen' => '6',
- 'Mecklenburg Vorpommern' => '7',
- 'Niedersachsen' => '8',
- 'Nordrhein Westfalen' => '9',
- 'Rheinland Pfalz' => '10',
- 'Saarland' => '11',
- 'Sachsen' => '12',
- 'Sachsen Anhalt' => '13',
- 'Schleswig Holstein' => '14',
- 'Thüringen' => '15',
- );
- foreach my $land ( keys %lands ){
- $form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land );
- }
-
+
+ my $tax_office = first { $_->{name} eq $form->{elsterland} } @{ $ustva->{tax_office_information} };
+ $form->{taxbird_land_nr} = $tax_office->{taxbird_nr} if $tax_office;
+
$form->{co_zip} = $form->{co_city};
$form->{co_zip} =~ s/\D//g;
$form->{co_city} =~ s/\d//g;
$form->{co_city} =~ s/^\s//g;
-
+
($form->{co_phone_prefix}, $form->{co_phone}) = split("-", $form->{tel});
$form->{co_phone_prefix} =~ s/\s//g;
$form->{co_phone} =~ s/\s//g;
-
+
$form->{taxbird_steuernummer} = $form->{steuernummer};
# $form->{taxbird_steuernummer} =~ s/\D//g;
$form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
-
+
# Numberformatting for Taxbird
my $temp_numberformat = $myconfig{numberformat};
# Numberformat must be '1000,00' for Taxbird ?!
@@ -956,17 +941,17 @@ sub generate_ustva {
foreach my $number (@category_cent) {
$form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
}
-
+
foreach my $number (@category_euro) {
$form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
}
# Re-set Numberformat
$myconfig{numberformat} = $temp_numberformat;
-
+
# push Kennziffern to <%foreach Array fo easyer
# output in xml format. Thx to Moritz.
my %taxbird_id_for = (
-
+
'511' => 'Kz51-calc',
'861' => 'Kz86-calc',
'971' => 'Kz97-calc',
@@ -979,8 +964,8 @@ sub generate_ustva {
'Z65' => 'ust-sum+69',
'Z67' => 'ust-vz',
);
-
-
+
+
for my $kennziffer (@category_cent, @category_euro) {
next if ($kennziffer eq 'Z43');
@@ -989,57 +974,62 @@ sub generate_ustva {
if (defined $taxbird_id_for{$kennziffer}) {
push(@{ $form->{id}}, $taxbird_id_for{$kennziffer});
} else {
- push(@{ $form->{id}}, "Kz$kennziffer");
+ push(@{ $form->{id}}, "Kz$kennziffer");
}
push(@{ $form->{amount}}, $form->{$kennziffer});
}
- }
-
+ }
+
} elsif ( $form->{format} eq '' ){ # No format error.
$form->header;
USTVA::error( $locale->text('Application Error. No Format given' ) . "!");
exit(0);
-
+
} else { # All other Formats are wrong
$form->header;
USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
exit(0);
}
- # Austria
- } elsif ($form->{coa} eq 'Austria') {
- #
- # Outputformat specific customisation's
- #
+ } else # Outputformat for generic output
+ {
+
+ my @category_cent = $ustva->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '2',
+ });
- 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
- );
-
+ my @category_euro = $ustva->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '0',
+ });
- if ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
+ $form->{USTVA} = [];
- $form->{IN} = $form->{type} . '.html';
- $form->{padding} = " ";
- $form->{bold} = "";
- $form->{endbold} = "";
- $form->{br} = "
";
- $form->{address} =~ s/\\n/\n/g;
+ if ( $form->{format} eq 'generic') { # Formatierungen für HTML Ausgabe
- foreach $number (@category_euro) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
+ 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;
USTVA::info(
@@ -1047,11 +1037,26 @@ sub generate_ustva {
'Yearly taxreport not yet implemented')
. '!');
}
-
+
$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();
}
@@ -1059,27 +1064,23 @@ sub generate_ustva {
sub config_step1 {
$lxdebug->enter_sub();
+ $auth->assert('advance_turnover_tax_return');
+
# edit all taxauthority prefs
$form->header;
- USTVA->get_config($userspath, 'finanzamt.ini');
+
+ my $ustva = USTVA->new();
+ $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|&root="$form->{cbroot}"|
- .qq|&rpw="$form->{cbrpw}"|;
- }
-
$form->{title} = $locale->text('Tax Office Preferences');
- my $select_tax_office = USTVA->fa_auswahl($land, $amt, &elster_hash());
+ my $select_tax_office = $ustva->fa_auswahl($land, $amt, $ustva->query_finanzamt(\%myconfig, $form));
my $checked_accrual = q|checked="checked"| if ($form->{method} eq 'accrual');
my $checked_cash = q|checked="checked"| if ($form->{method} eq 'cash');
my $checked_monthly = "checked" if ($form->{FA_voranmeld} eq 'month');
@@ -1089,33 +1090,37 @@ sub config_step1 {
my $_hidden_variables_ref;
- my %_hidden_local_variables = (
+ my %_hidden_local_variables = (
'saved' => $locale->text('Check Details'),
'nextsub' => 'config_step2',
'warnung' => '0',
);
foreach my $variable (keys %_hidden_local_variables) {
- push @{ $_hidden_variables_ref },
+ push @{ $_hidden_variables_ref },
{ 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
}
my @_hidden_form_variables = qw(
- FA_Name FA_Strasse FA_PLZ
- FA_Ort FA_Telefon FA_Fax
- FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach
- FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1
+ FA_Name FA_Strasse FA_PLZ
+ FA_Ort FA_Telefon FA_Fax
+ FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach
+ FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1
FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich
FA_Oeffnungszeiten FA_Email FA_Internet
steuernummer elsterland elstersteuernummer
- elsterFFFF login password
+ elsterFFFF
);
foreach my $variable (@_hidden_form_variables) {
- push @{ $_hidden_variables_ref},
+ push @{ $_hidden_variables_ref},
{ 'variable' => $variable, 'value' => $form->{$variable} };
}
+# Which COA is in use?
+
+ $ustva->get_coa($form, \%myconfig);
+
# hä? kann die weg?
my $steuernummer_new = '';
@@ -1128,9 +1133,9 @@ sub config_step1 {
checked_quarterly => $checked_quarterly,
checked_dauerfristverlaengerung => $checked_dauerfristverlaengerung,
hidden_variables => $_hidden_variables_ref,
-
+
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('ustva/config_step1', $template_ref));
@@ -1139,6 +1144,9 @@ sub config_step1 {
sub config_step2 {
$lxdebug->enter_sub();
+
+ $auth->assert('advance_turnover_tax_return');
+
$form->header();
# print qq|
@@ -1149,7 +1157,9 @@ sub config_step2 {
my $elster_amt = '';
my $elsterFFFF = '';
my $elstersteuernummer = '';
- USTVA->get_config($userspath, 'finanzamt.ini')
+
+ my $ustva = USTVA->new();
+ $ustva->get_config($userspath, 'finanzamt.ini')
if ($form->{saved} eq $locale->text('saved'));
# Auf Übergabefehler checken
@@ -1168,7 +1178,7 @@ sub config_step2 {
my $change = $form->{elsterland} eq $form->{elsterland_new}
&& $form->{elsterFFFF} eq $form->{elsterFFFF_new} ? '0' : '1';
$change = '0' if ($form->{saved} eq $locale->text('saved'));
- my $elster_init = &elster_hash();
+ my $elster_init = $ustva->query_finanzamt(\%myconfig, $form);
my %elster_init = %$elster_init;
@@ -1180,7 +1190,7 @@ sub config_step2 {
$form->{elsterland} = $elsterland;
$form->{elsterFFFF} = $elsterFFFF;
$form->{steuernummer} = '';
-
+
create_steuernummer();
# rebuild elster_amt
@@ -1217,17 +1227,18 @@ sub config_step2 {
my $steuernummer = $form->{steuernummer} if ($steuernummer eq '');
$form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
-
-
- my $input_steuernummer = USTVA->steuernummer_input(
- $form->{elsterland},
+
+ $ustva->get_coa($form, \%myconfig);
+
+ my $input_steuernummer = $ustva->steuernummer_input(
+ $form->{elsterland},
$form->{elsterFFFF},
$form->{steuernummer}
);
$lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|);
-
+
my $_hidden_variables_ref;
@@ -1239,29 +1250,26 @@ sub config_step2 {
'steuernummer' => $stnr,
'lastsub' => 'config_step1',
'nextsub' => 'save',
-
+
);
-
+
foreach my $variable (keys %_hidden_local_variables) {
- push @{ $_hidden_variables_ref },
+ push @{ $_hidden_variables_ref },
{ 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
}
-
+
my @_hidden_form_variables = qw(
- FA_steuerberater_name FA_steuerberater_street
+ FA_steuerberater_name FA_steuerberater_street
FA_steuerberater_city FA_steuerberater_tel
FA_voranmeld method
- FA_dauerfrist FA_71
- elster
- login password
- type elster_init
+ FA_dauerfrist FA_71
+ elster
+ type elster_init
saved callback
);
-
-
foreach my $variable (@_hidden_form_variables) {
- push @{ $_hidden_variables_ref},
+ push @{ $_hidden_variables_ref},
{ 'variable' => $variable, 'value' => $form->{$variable} };
}
@@ -1272,7 +1280,7 @@ sub config_step2 {
callback => $callback,
hidden_variables => $_hidden_variables_ref,
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('ustva/config_step2', $template_ref));
@@ -1282,6 +1290,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};
@@ -1318,7 +1329,11 @@ sub create_steuernummer {
sub save {
$lxdebug->enter_sub();
+
+ $auth->assert('advance_turnover_tax_return');
+
my $filename = "$form->{login}_$form->{filename}";
+ $filename =~ s|.*/||;
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
create_steuernummer();
@@ -1334,8 +1349,8 @@ sub save {
my @config = qw(
elster elsterland elstersteuernummer steuernummer
elsteramt elsterFFFF FA_Name FA_Strasse
- FA_PLZ FA_Ort FA_Telefon FA_Fax
- FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach FA_BLZ_1
+ FA_PLZ FA_Ort FA_Telefon FA_Fax
+ FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach FA_BLZ_1
FA_Kontonummer_1 FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2
FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten
FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name
@@ -1344,27 +1359,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 {
@@ -1393,11 +1410,3 @@ sub back {
$lxdebug->leave_sub();
}
-sub elster_hash {
- $lxdebug->enter_sub();
- my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form);
- $lxdebug->leave_sub();
- return $finanzamt;
-}
-
-