projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vergessenes locales-Update zum letzten Commit.
[kivitendo-erp.git]
/
bin
/
mozilla
/
ustva.pl
diff --git
a/bin/mozilla/ustva.pl
b/bin/mozilla/ustva.pl
index
679c7d1
..
b7b66fb
100644
(file)
--- 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 .= $form->{elstersteuernummer};
#file suffix
$file .= '.xml';
+ $file =~ s|.*/||;
$form->{tmpfile} = "$userspath/$file";
$form->{attachment_filename} = $file;
$form->{tmpfile} = "$userspath/$file";
$form->{attachment_filename} = $file;
@@
-882,6
+883,7
@@
sub generate_ustva {
$form->{attachment_filename} = "USTVA-" . $form->{period}
. sprintf("%02d", $form->{year} % 100) . ".txb";
$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
$form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
# TODO: set Output to UTF-8 or system Preference
@@
-1315,7
+1317,9
@@
sub create_steuernummer {
sub save {
$lxdebug->enter_sub();
sub save {
$lxdebug->enter_sub();
+
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
create_steuernummer();
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
create_steuernummer();
@@
-1341,27
+1345,29
@@
sub save {
# Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
if ($form->{elstersteuernummer} ne '000000000') {
# Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
if ($form->{elstersteuernummer} ne '000000000') {
+
$form->{elster} = '1';
$form->{elster} = '1';
- open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
+
+ open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
# create the config file
# create the config file
- print
CONF
qq|# Configuration file for USTVA\n\n|;
+ print
{$ustvaconfig}
qq|# Configuration file for USTVA\n\n|;
my $key = '';
foreach $key (sort @config) {
$form->{$key} =~ s/\\/\\\\/g;
# strip M
$form->{$key} =~ s/\r\n/\n/g;
my $key = '';
foreach $key (sort @config) {
$form->{$key} =~ s/\\/\\\\/g;
# strip M
$form->{$key} =~ s/\r\n/\n/g;
- print
CONF
qq|$key=|;
+ print
{$ustvaconfig}
qq|$key=|;
if ($form->{$key} ne 'Y') {
if ($form->{$key} ne 'Y') {
- print
CONF
qq|$form->{$key}\n|;
+ print
{$ustvaconfig}
qq|$form->{$key}\n|;
}
if ($form->{$key} eq 'Y') {
}
if ($form->{$key} eq 'Y') {
- print
CONF
qq|checked \n|;
+ print
{$ustvaconfig}
qq|checked \n|;
}
}
}
}
- print
CONF
qq|\n\n|;
- close
CONF
;
+ print
{$ustvaconfig}
qq|\n\n|;
+ close
$ustvaconfig
;
$form->{saved} = $locale->text('saved');
} else {
$form->{saved} = $locale->text('saved');
} else {