X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=8d77a314e23f1b722912a0920be405104e300d48;hb=a11d7a85a9b73798acb3a11b6ba4251ba331b19c;hp=db6995f89bf6d1a17a697faa5c1c2d6e67996f78;hpb=05c6840d4fbb90cbe81e14427617793c45ba4714;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index db6995f89..8d77a314e 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -1,5 +1,5 @@
#=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
#
# Author: Udo Spallek
@@ -23,6 +23,7 @@
# German Tax authority Module and later ELSTER Interface
#======================================================================
+use strict;
use utf8;
require "bin/mozilla/common.pl";
@@ -74,11 +75,13 @@ use SL::User;
#############################
sub report {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- my $myconfig = \%myconfig;
+ $::auth->assert('advance_turnover_tax_return');
$form->{title} = $locale->text('UStVA');
$form->{kz10} = ''; #Berichtigte Anmeldung? Ja =1 Nein=0
@@ -87,12 +90,12 @@ sub report {
0, 4);
my $department = '';
- local $hide = '';
+ my $hide = '';
$form->header;
# Einlesen der Finanzamtdaten
my $ustva = USTVA->new();
- $ustva->get_config($userspath, 'finanzamt.ini');
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
# Hier Einlesen der user-config
# steuernummer entfernt für prerelease
@@ -109,15 +112,14 @@ sub report {
co_accountnr3
);
- map { $form->{$_} = $myconfig->{$_} } @a;
+ map { $form->{$_} = $myconfig{$_} } @a;
my $openings = $form->{FA_Oeffnungszeiten};
$openings =~ s/\\\\n/
/g;
my $company_given = ($form->{company} ne '')
? qq|$form->{company}
\n|
- : qq||
+ : qq||
. $locale->text('No Company Name given') . qq|!
|;
@@ -190,14 +192,14 @@ sub report {
# Which COA is in use?
- $ustva->get_coa($form, $myconfig);
+ $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},
+ taxnumber => $myconfig{taxnumber},
select_year => $select_year,
period_local => $period_local,
method_local => $method_local,
@@ -212,44 +214,46 @@ sub report {
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub help {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
# parse help documents under doc
- my $tmp = $form->{templates};
- $form->{templates} = 'doc';
- $form->{help} = 'ustva';
- $form->{type} = 'help';
- $form->{format} = 'html';
- &generate_ustva();
+ my $tmp = $::form->{templates};
+ $::form->{templates} = 'doc';
+ $::form->{help} = 'ustva';
+ $::form->{type} = 'help';
+ $::form->{format} = 'html';
+ generate_ustva();
#$form->{templates} = $tmp;
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub show {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
#&generate_ustva();
- no strict 'refs';
- $lxdebug->leave_sub();
- call_sub($form->{"nextsub"});
- use strict 'refs';
+ $::lxdebug->leave_sub();
+ call_sub($::form->{"nextsub"});
}
sub ustva_vorauswahl {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
my $select_vorauswahl;
@@ -260,7 +264,7 @@ sub ustva_vorauswahl {
$form->{day} = substr($date, 6, 2);
$form->{month} = substr($date, 4, 2);
$form->{year} = substr($date, 0, 4);
- $lxdebug->message(LXDebug::DEBUG1, qq|
+ $::lxdebug->message(LXDebug->DEBUG1, qq|
Actual date from Database: $date\n
Actual year from Database: $form->{year}\n
Actual day from Database: $form->{day}\n
@@ -467,27 +471,27 @@ sub ustva_vorauswahl {
}
$select_vorauswahl .= qq||;
}
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
return $select_vorauswahl;
}
#sub config {
-# $lxdebug->enter_sub();
+# $::lxdebug->enter_sub();
# config_step1();
-# $lxdebug->leave_sub();
+# $::lxdebug->leave_sub();
#}
sub debug {
- $lxdebug->enter_sub();
- $form->debug();
- $lxdebug->leave_sub();
+ $::lxdebug->enter_sub();
+ $::form->debug();
+ $::lxdebug->leave_sub();
}
sub show_options {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
# $form->{PD}{$form->{type}} = "selected";
# $form->{DF}{$form->{format}} = "selected";
@@ -497,24 +501,24 @@ sub show_options {
my $media = qq| |;
my $format =
qq| |;
- if ($latex_templates) {
+ if ($::lx_office_conf{print_templates}{latex}) {
$format .=
qq| |;
}
#my $disabled= qq|disabled="disabled"|;
#$disabled='' if ($form->{elster} eq '1' );
- if ($form->{elster} eq '1') {
+ if ($::form->{elster} eq '1') {
$format .=
qq||
. qq||;
}
@@ -523,22 +527,26 @@ sub show_options {
$type
$media
+ . $::locale->text('Choose Outputformat') . qq|">$format
|;
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
return $show_options;
}
sub generate_ustva {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
+
+ $::auth->assert('advance_turnover_tax_return');
# Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini
my $ustva = USTVA->new();
- $ustva->get_config($userspath, 'finanzamt.ini');
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
# init some form vars
my @anmeldungszeitraum =
@@ -559,7 +567,7 @@ sub generate_ustva {
$form->current_date(\%myconfig), \%myconfig
),
0, 4);
- $lxdebug->message(LXDebug::DEBUG1,
+ $::lxdebug->message(LXDebug->DEBUG1,
qq|Actual year from Database: $form->{year}\n|);
}
@@ -674,9 +682,8 @@ sub generate_ustva {
};
}
- # Kontrollvariable für die Templates
- $form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0";
-
+ # Kontrollvariablen für die Templates
+ $form->{"year$_"} = ($form->{year} >= $_ ) ? "1":"0" for 2007..2107;
# Get the USTVA
$ustva->ustva(\%myconfig, \%$form);
@@ -693,13 +700,13 @@ sub generate_ustva {
# if there are any dates construct a where
if ($form->{fromdate} || $form->{todate}) {
- $form->{todate} = $form->current_date($myconfig) unless ($form->{todate});
+ $form->{todate} = $form->current_date(\%myconfig) unless ($form->{todate});
- my $longtodate = $locale->date($myconfig, $form->{todate}, 1, 0, 0);
- my $shorttodate = $locale->date($myconfig, $form->{todate}, 0, 0, 0);
+ my $longtodate = $locale->date(\%myconfig, $form->{todate}, 1, 0, 0);
+ my $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0, 0, 0);
- my $longfromdate = $locale->date($myconfig, $form->{fromdate}, 1, 0, 0);
- my $shortfromdate = $locale->date($myconfig, $form->{fromdate}, 0, 0, 0);
+ my $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1, 0, 0);
+ my $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
$form->{this_period} = "$shortfromdate
\n$shorttodate";
$form->{longperiod} =
@@ -769,7 +776,7 @@ sub generate_ustva {
dec_places => '2',
});
- push @category_cent, qw(83 Z43 Z45 Z53 Z62 Z65 Z67);
+ push @category_cent, qw(Z43 Z45 Z53 Z62 Z65 Z67);
my @category_euro = $ustva->report_variables({
myconfig => \%myconfig,
@@ -813,11 +820,11 @@ sub generate_ustva {
$form->{br} = "
";
$form->{address} =~ s/\\n/\n/g;
- foreach $number (@category_cent) {
+ foreach my $number (@category_cent) {
$form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
}
- foreach $number (@category_euro) {
+ foreach my $number (@category_euro) {
$form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0');
}
@@ -841,7 +848,6 @@ sub generate_ustva {
#file suffix
$file .= '.xml';
$file =~ s|.*/||;
- $form->{tmpfile} = "$userspath/$file";
$form->{attachment_filename} = $file;
@@ -849,9 +855,9 @@ sub generate_ustva {
my $temp_numberformat = $myconfig{numberformat};
- # Numberformat must be '1000.00' for Winston
+ # Numberformat must be '1000,00' for Winston
- $myconfig{numberformat} = '1000.00';
+ $myconfig{numberformat} = '1000,00';
foreach my $number (@category_cent) {
$form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
@@ -887,11 +893,9 @@ sub generate_ustva {
# Define serveral filenames
$form->{IN} = 'taxbird.txb';
- $form->{attachment_filename} = "USTVA-" . $form->{period}
- . sprintf("%02d", $form->{year} % 100) . ".txb";
+ $form->{attachment_filename} = "USTVA-" . ($form->{period} * 1) . 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
#$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8");
@@ -911,30 +915,46 @@ sub generate_ustva {
} elsif ($form->{period} =~ /^\d+$/ ) {
$form->{period} =~ s/^0//g;
my $period = $form->{period};
- $period * 1;
+ $period *= 1;
$period--;
- $form->{period} = $period;
+ $form->{taxbird_period} = $period;
} else {
$form->header;
USTVA::error( $locale->text('Wrong Period' ));
::end_of_request();
}
+ # heuristics for address splitting
+ # lx-office holds the entire address in a single field.
+ # taxbird expects it to be splitted into street, zipcode and city
+ if ($form->{co_street} =~ /\n/) {
+ my $new_co_street;
+ for (split /\n/, $form->{co_street}) {
+ if (/(\d{3,5})\s+(\w+)/) {
+ $form->{co_zip} = $1;
+ $form->{co_city} = $2;
+ } else {
+ $new_co_street .= $_;
+ }
+ }
+ $form->{co_street} = $new_co_street;
+ } else {
+ $form->{co_zip} = $form->{co_city};
+ $form->{co_zip} =~ s/\D//g;
+ $form->{co_city} =~ s/\d//g;
+ $form->{co_city} =~ s/^\s//g;
+ }
+
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
+# $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
# Numberformatting for Taxbird
my $temp_numberformat = $myconfig{numberformat};
@@ -1023,8 +1043,8 @@ sub generate_ustva {
$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 );
+ $::lxdebug->message($LXDebug::DEBUG, "Kennziffer $kennziffer: '$form->{$kennziffer}'" );
+ $::lxdebug->dump($LXDebug::DEBUG, $rec_ref );
push @ { $form->{USTVA} }, $rec_ref;
}
@@ -1047,7 +1067,7 @@ sub generate_ustva {
$form->header();
- $template_ref = {
+ my $template_ref = {
taxnumber => $myconfig{taxnumber},
};
@@ -1056,46 +1076,46 @@ sub generate_ustva {
} else
{
- $form->parse_template(\%myconfig, $userspath);
+ $form->parse_template(\%myconfig, $::lx_office_conf{paths}{userspath});
}
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub config_step1 {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
-$form->{title} = $locale->text('Tax Office Preferences');
+$::form->{title} = $::locale->text('Tax Office Preferences');
# edit all taxauthority prefs
- $form->header;
+ $::form->header;
my $ustva = USTVA->new();
- $ustva->get_config($userspath, 'finanzamt.ini');
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
- my $land = $form->{elsterland};
- my $amt = $form->{elsterFFFF};
+ my $land = $::form->{elsterland};
+ my $amt = $::form->{elsterFFFF};
- $form->{title} = $locale->text('Tax Office Preferences');
+ $::form->{title} = $::locale->text('Tax Office Preferences');
- 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');
- my $checked_quarterly = "checked" if ($form->{FA_voranmeld} eq 'quarter');
- my $checked_dauerfristverlaengerung = "checked" if ($form->{FA_dauerfrist} eq '1');
- my $checked_kz_71 = "checked" if ($form->{FA_71} eq 'X');
+ my $select_tax_office = $ustva->fa_auswahl($land, $amt, $ustva->query_finanzamt(\%::myconfig, $::form));
+ my $checked_accrual = $::form->{method} eq 'accrual' ? q|checked="checked"| : '';
+ my $checked_cash = $::form->{method} eq 'cash' ? q|checked="checked"| : '';
+ my $checked_monthly = $::form->{FA_voranmeld} eq 'month' ? "checked" : '';
+ my $checked_quarterly = $::form->{FA_voranmeld} eq 'quarter' ? "checked" : '';
+ my $checked_dauerfristverlaengerung = $::form->{FA_dauerfrist} eq '1' ? "checked" : '';
+ my $checked_kz_71 = $::form->{FA_71} eq 'X' ? "checked" : '';
my $_hidden_variables_ref;
my %_hidden_local_variables = (
- 'saved' => $locale->text('Check Details'),
+ 'saved' => $::locale->text('Check Details'),
'nextsub' => 'config_step2',
'warnung' => '0',
);
@@ -1118,12 +1138,12 @@ $form->{title} = $locale->text('Tax Office Preferences');
foreach my $variable (@_hidden_form_variables) {
push @{ $_hidden_variables_ref},
- { 'variable' => $variable, 'value' => $form->{$variable} };
+ { 'variable' => $variable, 'value' => $::form->{$variable} };
}
# Which COA is in use?
- $ustva->get_coa($form, \%myconfig);
+ $ustva->get_coa($::form, \%::myconfig);
# hä? kann die weg?
my $steuernummer_new = '';
@@ -1141,21 +1161,21 @@ $form->{title} = $locale->text('Tax Office Preferences');
};
# Ausgabe des Templates
- print($form->parse_html_template('ustva/config_step1', $template_ref));
+ print($::form->parse_html_template('ustva/config_step1', $template_ref));
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub config_step2 {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- $form->header();
+ $::auth->assert('advance_turnover_tax_return');
-# print qq|
-#
-# |;
+ $form->header();
my $elsterland = '';
my $elster_amt = '';
@@ -1163,7 +1183,7 @@ sub config_step2 {
my $elstersteuernummer = '';
my $ustva = USTVA->new();
- $ustva->get_config($userspath, 'finanzamt.ini')
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini')
if ($form->{saved} eq $locale->text('saved'));
# Auf Ãbergabefehler checken
@@ -1198,11 +1218,7 @@ sub config_step2 {
create_steuernummer();
# rebuild elster_amt
- my $amt = '';
- foreach $amt (keys %{ $elster_init{ $form->{elsterland} } }) {
- $elster_amt = $amt
- if ($elster_init{ $form->{elsterland}{$amt} eq $form->{elsterFFFF} });
- }
+ my $amt = $elster_init{$elsterFFFF};
# load the predefined hash data into the FA_* Vars
my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort
@@ -1228,7 +1244,7 @@ sub config_step2 {
my $patterncount = $form->{patterncount};
my $elster_pattern = $form->{elster_pattern};
my $delimiter = $form->{delimiter};
- my $steuernummer = $form->{steuernummer} if ($steuernummer eq '');
+ my $steuernummer = $stnr eq '' ? $form->{steuernummer} : '';
$form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
@@ -1241,7 +1257,7 @@ sub config_step2 {
$form->{steuernummer}
);
- $lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|);
+ $::lxdebug->message(LXDebug->DEBUG1, qq|$input_steuernummer|);
my $_hidden_variables_ref;
@@ -1249,7 +1265,7 @@ sub config_step2 {
my %_hidden_local_variables = (
'elsterland' => $elsterland,
'elsterFFFF' => $elsterFFFF,
- 'warnung' => $warnung,
+ 'warnung' => 0,
'elstersteuernummer' => $elstersteuernummer,
'steuernummer' => $stnr,
'lastsub' => 'config_step1',
@@ -1278,10 +1294,9 @@ sub config_step2 {
}
my $template_ref = {
- tax_office_data => $tax_office_data,
input_steuernummer => $input_steuernummer,
readonly => '', #q|disabled="disabled"|,
- callback => $callback,
+ callback => $form->{callback},
hidden_variables => $_hidden_variables_ref,
};
@@ -1289,18 +1304,18 @@ sub config_step2 {
print($form->parse_html_template('ustva/config_step2', $template_ref));
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub create_steuernummer {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
- my $part = $form->{part};
- my $patterncount = $form->{patterncount};
- my $delimiter = $form->{delimiter};
- my $elster_pattern = $form->{elster_pattern};
+ my $part = $::form->{part};
+ my $patterncount = $::form->{patterncount};
+ my $delimiter = $::form->{delimiter};
+ my $elster_pattern = $::form->{elster_pattern};
# rebuild steuernummer and elstersteuernummer
# es gibt eine gespeicherte steuernummer $form->{steuernummer}
@@ -1310,33 +1325,33 @@ sub create_steuernummer {
my $i = 0;
my $steuernummer_new = $part;
- my $elstersteuernummer_new = $form->{elster_FFFF};
+ my $elstersteuernummer_new = $::form->{elster_FFFF};
$elstersteuernummer_new .= '0';
for ($h = 1; $h < $patterncount; $h++) {
$steuernummer_new .= qq|$delimiter|;
for (my $i = 1; $i <= length($elster_pattern); $i++) {
- $steuernummer_new .= $form->{"part_$h\_$i"};
- $elstersteuernummer_new .= $form->{"part_$h\_$i"};
+ $steuernummer_new .= $::form->{"part_$h\_$i"};
+ $elstersteuernummer_new .= $::form->{"part_$h\_$i"};
}
}
- if ($form->{steuernummer} ne $steuernummer_new) {
- $form->{steuernummer} = $steuernummer_new;
- $form->{elstersteuernummer} = $elstersteuernummer_new;
- $form->{steuernummer_new} = $steuernummer_new;
+ if ($::form->{steuernummer} ne $steuernummer_new) {
+ $::form->{steuernummer} = $steuernummer_new;
+ $::form->{elstersteuernummer} = $elstersteuernummer_new;
+ $::form->{steuernummer_new} = $steuernummer_new;
} else {
- $form->{steuernummer_new} = '';
- $form->{elstersteuernummer_new} = '';
+ $::form->{steuernummer_new} = '';
+ $::form->{elstersteuernummer_new} = '';
}
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub save {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
- my $filename = "$form->{login}_$form->{filename}";
+ my $filename = "$::form->{login}_$::form->{filename}";
$filename =~ s|.*/||;
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
@@ -1344,11 +1359,11 @@ sub save {
# Textboxen formatieren: Linebreaks entfernen
#
- $form->{FA_Oeffnungszeiten} =~ s/\r\n/\\n/g;
+ $::form->{FA_Oeffnungszeiten} =~ s/\r\n/\\n/g;
#URL mit http:// davor?
- $form->{FA_Internet} =~ s/^http:\/\///;
- $form->{FA_Internet} = 'http://' . $form->{FA_Internet};
+ $::form->{FA_Internet} =~ s/^http:\/\///;
+ $::form->{FA_Internet} = 'http://' . $::form->{FA_Internet};
my @config = qw(
elster elsterland elstersteuernummer steuernummer
@@ -1362,55 +1377,52 @@ sub save {
FA_71 FA_dauerfrist);
# Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
- if ($form->{elstersteuernummer} ne '000000000') {
+ if ($::form->{elstersteuernummer} ne '000000000') {
- $form->{elster} = '1';
+ $::form->{elster} = '1';
- open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
+ open my $ustvaconfig, ">", "$::lx_office_conf{paths}{userspath}/$filename" or $::form->error("$filename : $!");
# create the config file
print {$ustvaconfig} qq|# Configuration file for USTVA\n\n|;
my $key = '';
foreach $key (sort @config) {
- $form->{$key} =~ s/\\/\\\\/g;
+ $::form->{$key} =~ s/\\/\\\\/g;
# strip M
- $form->{$key} =~ s/\r\n/\n/g;
+ $::form->{$key} =~ s/\r\n/\n/g;
print {$ustvaconfig} qq|$key=|;
- if ($form->{$key} ne 'Y') {
- print {$ustvaconfig} qq|$form->{$key}\n|;
+ if ($::form->{$key} ne 'Y') {
+ print {$ustvaconfig} qq|$::form->{$key}\n|;
}
- if ($form->{$key} eq 'Y') {
+ if ($::form->{$key} eq 'Y') {
print {$ustvaconfig} qq|checked \n|;
}
}
print {$ustvaconfig} qq|\n\n|;
close $ustvaconfig;
- $form->{saved} = $locale->text('saved');
+ $::form->{saved} = $::locale->text('saved');
} else {
- $form->{saved} = $locale->text('Choose a Tax Number');
+ $::form->{saved} = $::locale->text('Choose a Tax Number');
}
config_step2();
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub continue {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
# allow Symbolic references just here:
- no strict 'refs';
- call_sub($form->{"nextsub"});
- use strict 'refs';
- $lxdebug->leave_sub();
+ call_sub($::form->{"nextsub"});
+ $::lxdebug->leave_sub();
}
sub back {
- $lxdebug->enter_sub();
- call_sub($form->{"lastsub"});
- $lxdebug->leave_sub();
+ $::lxdebug->enter_sub();
+ call_sub($::form->{"lastsub"});
+ $::lxdebug->leave_sub();
}
-