X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=8d77a314e23f1b722912a0920be405104e300d48;hb=e967296577305948fa2e4b7fd3d256c2509b2080;hp=c455740be8e37d21ed6d8fb90365898f70595c73;hpb=74fca575d438232002756175338c23f55b8a6c12;p=kivitendo-erp.git diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index c455740be..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 @@ -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"); @@ -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 @@ -1437,4 +1426,3 @@ sub back { call_sub($::form->{"lastsub"}); $::lxdebug->leave_sub(); } -