projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix für Bug 1708 - Fehlender Übertrag der Lieferadresse
[kivitendo-erp.git]
/
bin
/
mozilla
/
ustva.pl
diff --git
a/bin/mozilla/ustva.pl
b/bin/mozilla/ustva.pl
index
c455740
..
61ed296
100644
(file)
--- a/
bin/mozilla/ustva.pl
+++ b/
bin/mozilla/ustva.pl
@@
-848,7
+848,6
@@
sub generate_ustva {
#file suffix
$file .= '.xml';
$file =~ s|.*/||;
#file suffix
$file .= '.xml';
$file =~ s|.*/||;
- $form->{tmpfile} = "$::lx_office_conf{paths}{userspath}/$file";
$form->{attachment_filename} = $file;
$form->{attachment_filename} = $file;
@@
-894,11
+893,9
@@
sub generate_ustva {
# Define serveral filenames
$form->{IN} = 'taxbird.txb';
# 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->{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");
# TODO: set Output to UTF-8 or system Preference
#$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8");
@@
-1225,11
+1222,7
@@
sub config_step2 {
create_steuernummer();
# rebuild elster_amt
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
# load the predefined hash data into the FA_* Vars
my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort