}
];
+ # Which COA is in use?
+ USTVA->get_coa($form, $myconfig);
+
my $template_ref = {
openings => $openings,
company_given => $company_given,
address_given => $address_given,
taxnumber_given => $taxnumber_given,
+ taxnumber => $myconfig->{taxnumber},
select_year => $select_year,
period_local => $period_local,
method_local => $method_local,
checkbox_kz_10 => $checkbox_kz_10,
tax_office_banks => $tax_office_banks_ref,
select_options => &show_options,
+
};
print($form->parse_html_template('ustva/report', $template_ref));
# Outputformat specific customisation's
#
- my @category_cent = qw(
- 511 861 36 80 971 931 98 96 53 74
- 85 65 66 61 62 67 63 64 59 69
- 39 83 811 891 Z43 Z45 Z53 Z62 Z65 Z67
-
- );
-
- my @category_euro = qw(
- 41 44 49 43 48 51 86 35 77 76 91 89
- 97 93 95 94 42 60 45 52 73 84 81
- );
+ my @category_cent = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '2',
+ });
+ push @category_cent, qw(83 Z43 Z45 Z53 Z62 Z65 Z67);
+
+ my @category_euro = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '0',
+ });
+
$form->{id} = [];
$form->{amount} = [];
$file .= $form->{elstersteuernummer};
#file suffix
$file .= '.xml';
+ $file =~ s|.*/||;
$form->{tmpfile} = "$userspath/$file";
- $form->{attachment_filename} = "$file";
+ $form->{attachment_filename} = $file;
# Zahlenformatierung für Winston
# 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
$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
exit(0);
}
- # Austria
- } elsif ($form->{coa} eq 'Austria') {
-
- #
- # Outputformat specific customisation's
- #
-
- my @category_euro = qw(
- 511 861 36 80 971 931 98 96 53 74
- 85 65 66 61 62 67 63 64 59 69
- 39 83 811 891 Z43 Z45 Z53 Z62 Z65 Z67
- 41 44 49 43 48 51 86 35 77 76 91 89
- 97 93 95 94 42 60 45 52 73 84 81
- );
-
-
- if ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
-
- $form->{IN} = $form->{type} . '.html';
- $form->{padding} = " ";
- $form->{bold} = "<b>";
- $form->{endbold} = "</b>";
- $form->{br} = "<br>";
- $form->{address} =~ s/\\n/\n/g;
-
- foreach $number (@category_euro) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
+
+ } else # Outputformat for generic output
+ {
+
+ my @category_cent = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '2',
+ });
+
+ my @category_euro = USTVA->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '0',
+ });
+
+ $form->{"Watchdog::USTVA"} = 1;
+ $form->{USTVA} = [];
+
+ if ( $form->{format} eq 'generic') { # Formatierungen für HTML Ausgabe
+
+ my $rec_ref = {};
+ for my $kennziffer (@category_cent, @category_euro) {
+ $rec_ref = {};
+ $rec_ref->{id} = $kennziffer;
+ $rec_ref->{amount} = $form->format_amount(\%myconfig, $form->{$kennziffer}, 2, '0');
+
+ $lxdebug->message($LXDebug::DEBUG, "Kennziffer $kennziffer: '$form->{$kennziffer}'" );
+ $lxdebug->dump($LXDebug::DEBUG, $rec_ref );
+ push @ { $form->{USTVA} }, $rec_ref;
}
+
}
-
- }
- # end nation specific customisations
+ }
if ( $form->{period} eq '13' and $form->{format} ne 'html') {
$form->header;
$form->{templates} = $myconfig{templates};
$form->{templates} = "doc" if ( $form->{type} eq 'help' );
- $form->parse_template(\%myconfig, $userspath);
+ if ($form->{format} eq 'generic'){
+
+ $form->header();
+
+ $template_ref = {
+ taxnumber => $myconfig{taxnumber},
+ };
+
+ print($form->parse_html_template2('ustva/generic_taxreport', $template_ref));
+
+ } else
+ {
+
+ $form->parse_template(\%myconfig, $userspath);
+
+ }
$lxdebug->leave_sub();
}
{ 'variable' => $variable, 'value' => $form->{$variable} };
}
+# Which COA is in use?
+
+ USTVA->get_coa($form, \%myconfig);
+
# hä? kann die weg?
my $steuernummer_new = '';
saved callback
);
-
-
foreach my $variable (@_hidden_form_variables) {
push @{ $_hidden_variables_ref},
{ 'variable' => $variable, 'value' => $form->{$variable} };
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();
# Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
if ($form->{elstersteuernummer} ne '000000000') {
+
$form->{elster} = '1';
- open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
+
+ open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
# 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;
- print CONF qq|$key=|;
+ print {$ustvaconfig} qq|$key=|;
if ($form->{$key} ne 'Y') {
- print CONF qq|$form->{$key}\n|;
+ print {$ustvaconfig} qq|$form->{$key}\n|;
}
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 {
projects / kivitendo-erp.git / blobdiff