projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Endloses Aneinanderhängen von Währungen unterbinden
[kivitendo-erp.git]
/
bin
/
mozilla
/
ustva.pl
diff --git
a/bin/mozilla/ustva.pl
b/bin/mozilla/ustva.pl
index
8c1b8a8
..
f88fce5
100644
(file)
--- a/
bin/mozilla/ustva.pl
+++ b/
bin/mozilla/ustva.pl
@@
-196,7
+196,7
@@
sub report {
# Which COA is in use?
# Which COA is in use?
- $ustva->get_coa($form
, \%myconfig);
+ $ustva->get_coa($form
); # fetches coa and modifies some form variables
my $template_ref = {
openings => $openings,
my $template_ref = {
openings => $openings,
@@
-818,12
+818,12
@@
sub generate_ustva {
} elsif ( $form->{format} eq '' ){ # No format error.
$form->header;
USTVA::error( $locale->text('Application Error. No Format given' ) . "!");
} elsif ( $form->{format} eq '' ){ # No format error.
$form->header;
USTVA::error( $locale->text('Application Error. No Format given' ) . "!");
-
::end_of_request()
;
+
$::dispatcher->end_request
;
} else { # All other Formats are wrong
$form->header;
USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
} else { # All other Formats are wrong
$form->header;
USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
-
::end_of_request()
;
+
$::dispatcher->end_request
;
}
}
@@
-887,7
+887,8
@@
sub generate_ustva {
} else
{
} else
{
- #$form->parse_template(\%myconfig, $::lx_office_conf{paths}{userspath});
+ # add a prefix for ustva pos numbers, i.e.: 81 -> post_ustva_81
+ $form->{"pos_ustva_$_"} = $form->{$_} for grep { m{^\d+} } keys %{ $form };
$form->{title} = $locale->text('Advance turnover tax return');
$form->header;
$form->{title} = $locale->text('Advance turnover tax return');
$form->header;
@@
-959,7
+960,7
@@
$::form->{title} = $::locale->text('Tax Office Preferences');
# Which COA is in use?
# Which COA is in use?
- $ustva->get_coa($::form
, \%::myconfig);
+ $ustva->get_coa($::form
); # fetches coa and modifies some form variables
# hä? kann die weg?
my $steuernummer_new = '';
# hä? kann die weg?
my $steuernummer_new = '';
@@
-1065,7
+1066,7
@@
sub config_step2 {
$form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
$form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
- $ustva->get_coa($form
, \%myconfig);
+ $ustva->get_coa($form
); # fetches coa and modifies some form variables
my $input_steuernummer = $ustva->steuernummer_input(
$form->{elsterland},
my $input_steuernummer = $ustva->steuernummer_input(
$form->{elsterland},
@@
-1167,7
+1168,7
@@
sub save {
$::auth->assert('advance_turnover_tax_return');
$::auth->assert('advance_turnover_tax_return');
- my $filename = "$::
form->
{login}_$::form->{filename}";
+ my $filename = "$::
myconfig
{login}_$::form->{filename}";
$filename =~ s|.*/||;
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
$filename =~ s|.*/||;
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen