X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=8a3b3540ca7b6f23d343316fa5d5caf90719828f;hb=991315859c7b0f25da49baad4822492510b6b3bb;hp=e072b27fdecab5e331c94e7ab73fc62d75323592;hpb=468b6bcf141317a5f08cbe632d23758de445bac6;p=kivitendo-erp.git diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index e072b27fd..8a3b3540c 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -833,6 +833,7 @@ sub generate_ustva { $file .= $form->{elstersteuernummer}; #file suffix $file .= '.xml'; + $file =~ s|.*/||; $form->{tmpfile} = "$userspath/$file"; $form->{attachment_filename} = $file; @@ -855,28 +856,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 @@ -885,6 +883,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 @@ -1318,7 +1317,9 @@ sub create_steuernummer { 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();