Revision 88abbfe0
Von Udo Spallek vor etwa 18 Jahren hinzugefügt
| SL/USTVA.pm | ||
|---|---|---|
| 605 | 605 |
$form->{"86r"} = $form->{"861"};
|
| 606 | 606 |
$form->{"97r"} = $form->{"971"};
|
| 607 | 607 |
$form->{"93r"} = $form->{"931"};
|
| 608 |
$form->{"Z43"} =
|
|
| 609 |
$form->{"511"} + $form->{"861"} + $form->{"36"} + $form->{"80"} +
|
|
| 610 |
$form->{"971"} + $form->{"931"} + $form->{"96"} + $form->{"98"};
|
|
| 608 |
$form->{"Z43"} = $form->{"511"} + $form->{"861"} + $form->{"36"}
|
|
| 609 |
+ $form->{"80"} + $form->{"971"} + $form->{"931"}
|
|
| 610 |
+ $form->{"96"} + $form->{"98"};
|
|
| 611 | 611 |
$form->{"Z45"} = $form->{"Z43"};
|
| 612 | 612 |
$form->{"Z53"} = $form->{"Z43"};
|
| 613 |
$form->{"Z62"} =
|
|
| 614 |
$form->{"Z43"} - $form->{"66"} - $form->{"61"} - $form->{"62"} -
|
|
| 615 |
$form->{"63"} - $form->{"64"} - $form->{"59"};
|
|
| 616 |
$form->{"Z65"} = $form->{"Z62"} - $form->{"69"};
|
|
| 617 |
$form->{"83"} = $form->{"Z65"} - $form->{"39"};
|
|
| 613 |
$form->{"Z62"} = $form->{"Z43"} - $form->{"66"} - $form->{"61"}
|
|
| 614 |
- $form->{"62"} - $form->{"63"} - $form->{"64"}
|
|
| 615 |
- $form->{"59"};
|
|
| 616 |
$form->{"Z65"} = $form->{"Z62"} - $form->{"69"};
|
|
| 617 |
$form->{"83"} = $form->{"Z65"} - $form->{"39"};
|
|
| 618 | 618 |
# Hier fehlen moeglicherweise noch einige Berechnungen! |
| 619 | 619 |
|
| 620 | 620 |
$dbh->disconnect; |
| bin/mozilla/ustva.pl | ||
|---|---|---|
| 738 | 738 |
# Outputformat specific customisation's |
| 739 | 739 |
# |
| 740 | 740 |
|
| 741 |
my @category_cent = qw(511 861 36 80 971 931 98 96 53 74 |
|
| 742 |
85 65 66 61 62 67 63 64 59 69 39 83 |
|
| 743 |
Z43 Z45 Z53 Z62 Z65 Z67); |
|
| 741 |
my @category_cent = qw( |
|
| 742 |
511 861 36 80 971 931 98 96 53 74 |
|
| 743 |
85 65 66 61 62 67 63 64 59 69 |
|
| 744 |
39 83 Z43 Z45 Z53 Z62 Z65 Z67 |
|
| 745 |
); |
|
| 744 | 746 |
|
| 745 |
my @category_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93 |
|
| 746 |
95 94 42 60 45 52 73 84); |
|
| 747 |
my @category_euro = qw( |
|
| 748 |
41 44 49 43 48 51 86 35 77 76 91 |
|
| 749 |
97 93 95 94 42 60 45 52 73 84 |
|
| 750 |
); |
|
| 747 | 751 |
|
| 748 | 752 |
if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') {
|
| 749 | 753 |
|
| ... | ... | |
| 829 | 833 |
|
| 830 | 834 |
elsif ( $form->{format} eq 'elstertaxbird' ) {
|
| 831 | 835 |
|
| 836 |
# Define serveral filenames |
|
| 832 | 837 |
$form->{IN} = 'taxbird.txb';
|
| 833 | 838 |
|
| 834 | 839 |
$form->{attachment_filename} = "USTVA-" . $form->{period}
|
| ... | ... | |
| 836 | 841 |
|
| 837 | 842 |
$form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
|
| 838 | 843 |
|
| 844 |
# TODO: set Output to UTF-8 or system Preference |
|
| 845 |
#$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8");
|
|
| 846 |
#my $iconv = $self->{"iconv"};
|
|
| 847 |
#$iconv->convert($variable); |
|
| 848 |
|
|
| 839 | 849 |
if ($form->{period} =~ /^[4]\d$/ ){
|
| 840 | 850 |
my %periods = ( # Lx => taxbird |
| 841 | 851 |
'41' => '12', |
| ... | ... | |
| 871 | 881 |
$form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land );
|
| 872 | 882 |
} |
| 873 | 883 |
|
| 874 |
|
|
| 875 |
|
|
| 876 | 884 |
$form->{co_zip} = $form->{co_city};
|
| 877 | 885 |
$form->{co_zip} =~ s/\D//g;
|
| 878 | 886 |
$form->{co_city} =~ s/\d//g;
|
| ... | ... | |
| 887 | 895 |
$form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
|
| 888 | 896 |
|
| 889 | 897 |
# Numberformatting for Taxbird |
| 890 |
|
|
| 891 | 898 |
my $temp_numberformat = $myconfig{numberformat};
|
| 892 |
# Numberformat must be '1000.00' for Taxbird ?! |
|
| 893 | 899 |
|
| 894 |
$myconfig{numberformat} = '1000.00';
|
|
| 900 |
# Numberformat must be '1000,00' for Taxbird ?! |
|
| 901 |
$myconfig{numberformat} = '1000,00';
|
|
| 895 | 902 |
|
| 896 | 903 |
foreach my $number (@category_cent) {
|
| 897 | 904 |
$form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
|
Auch abrufbar als: Unified diff
Formatierungscleanup, Taxbird Nummernformat auf '1000,00' geaendert.