X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=d5c42a039ad69688037c26785ce0221c0b27f4f1;hb=5d0aec66f1d31f99c14944f6405c7fb712f99756;hp=7aa371fbfc91adf9a987a0e79a427c4316b742b9;hpb=1b026c0ba4de5794f38606a20f73b17ad85b44d8;p=kivitendo-erp.git diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 7aa371fbf..d5c42a039 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -776,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, @@ -848,7 +848,6 @@ sub generate_ustva { #file suffix $file .= '.xml'; $file =~ s|.*/||; - $form->{tmpfile} = "$::lx_office_conf{paths}{userspath}/$file"; $form->{attachment_filename} = $file; @@ -856,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', '') : ''; @@ -894,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} = "$::lx_office_conf{paths}{userspath}/" . $form->{attachment_filename}; # TODO: set Output to UTF-8 or system Preference #$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8"); @@ -1107,13 +1104,13 @@ $::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; @@ -1180,10 +1177,6 @@ sub config_step2 { $form->header(); -# print qq| -# -# |; - my $elsterland = ''; my $elster_amt = ''; my $elsterFFFF = ''; @@ -1225,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 @@ -1255,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 ($stnr eq ''); + my $steuernummer = $stnr eq '' ? $form->{steuernummer} : ''; $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;