X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=212c3815c2962a86ce8da339b1d2a05d25626d3d;hb=09685616f65f95b3189049855dfc53d2bf1ef271;hp=3e353e832d3d4a841f245a974eee02971c30afad;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 3e353e832..212c3815c 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -24,7 +24,6 @@ # German Tax authority Module and later ELSTER Interface #====================================================================== -require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; #use strict; @@ -69,13 +68,13 @@ use SL::User; # $locale->text('Nov') # $locale->text('Dec') -# $form->parse_html_template('generic/util_hidden_variables'); - ############################# sub report { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + my $myconfig = \%myconfig; $form->{title} = $locale->text('UStVA'); @@ -113,9 +112,8 @@ sub report { my $company_given = ($form->{company} ne '') ? qq|

$form->{company}

\n| - : qq|{login}| - . qq|&password=$form->{password}>| + : qq|| . $locale->text('No Company Name given') . qq|!
|; @@ -123,25 +121,19 @@ sub report { # klären, ob $form->{company_street|_address} gesetzt sind if ($form->{address} ne '') { my $temp = $form->{address}; - $temp =~ s/\\n/
/; + $temp =~ s/\n/
/; ($form->{co_street}, $form->{co_city}) = split("
", $temp); - $form->{co_city} =~ s/\\n//g; + $form->{co_city} =~ s/\n//g; } my $address_given = - ($form->{co_street} ne '' - and ( - $form->{co_zip} ne '' - or $form->{co_city} ne '' - ) - ) + ($form->{co_street} && ($form->{co_zip} || $form->{co_city})) ? qq|$form->{co_street}
| . qq|$form->{co_street1}
| . qq|$form->{co_zip} $form->{co_city}| - : qq|{login}| - . qq|&password=$form->{password}>| + : qq|| . $locale->text('No Company Address given') . qq|!\n|; @@ -153,8 +145,7 @@ sub report { my $taxnumber_given = ($form->{steuernummer} ne '') ? qq|$form->{steuernummer}| : qq|{login}| - . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!| + . qq|&level=Programm--Finanzamteinstellungen">Keine Steuernummer hinterlegt!| . qq|
|; my $ustva_vorauswahl = &ustva_vorauswahl(); @@ -197,12 +188,16 @@ sub report { } ]; + # 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, @@ -210,6 +205,7 @@ sub report { 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)); @@ -224,6 +220,8 @@ sub report { sub help { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + # parse help documents under doc my $tmp = $form->{templates}; $form->{templates} = 'doc'; @@ -239,6 +237,8 @@ sub help { sub show { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + #&generate_ustva(); no strict 'refs'; $lxdebug->leave_sub(); @@ -249,6 +249,8 @@ sub show { sub ustva_vorauswahl { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + my $select_vorauswahl; #Aktuelles Datum zerlegen: @@ -485,6 +487,8 @@ sub debug { sub show_options { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + # $form->{PD}{$form->{type}} = "selected"; # $form->{DF}{$form->{format}} = "selected"; # $form->{OP}{$form->{media}} = "selected"; @@ -529,6 +533,8 @@ sub show_options { sub generate_ustva { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini USTVA->get_config($userspath, 'finanzamt.ini'); @@ -754,18 +760,24 @@ sub generate_ustva { # 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} = []; @@ -827,9 +839,10 @@ sub generate_ustva { $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 @@ -849,28 +862,25 @@ sub generate_ustva { # 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 @@ -879,6 +889,7 @@ sub generate_ustva { $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 @@ -1000,39 +1011,44 @@ sub generate_ustva { 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} = ""; - $form->{endbold} = ""; - $form->{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->{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; @@ -1045,7 +1061,22 @@ sub generate_ustva { $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_template('ustva/generic_taxreport', $template_ref)); + + } else + { + + $form->parse_template(\%myconfig, $userspath); + + } $lxdebug->leave_sub(); } @@ -1053,6 +1084,8 @@ sub generate_ustva { sub config_step1 { $lxdebug->enter_sub(); + $auth->assert('advance_turnover_tax_return'); + # edit all taxauthority prefs $form->header; @@ -1062,14 +1095,6 @@ sub config_step1 { my $amt = $form->{elsterFFFF}; - if ($form->{cbscript} ne '' and $form->{cblogin} ne '') { - $callback = qq|$form->{cbscript}| - .qq|?action="config_step1"| - .qq|&login="$form->{cblogin}"| - .qq|&root="$form->{cbroot}"| - .qq|&rpw="$form->{cbrpw}"|; - } - $form->{title} = $locale->text('Tax Office Preferences'); @@ -1102,7 +1127,7 @@ sub config_step1 { FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten FA_Email FA_Internet steuernummer elsterland elstersteuernummer - elsterFFFF login password + elsterFFFF ); foreach my $variable (@_hidden_form_variables) { @@ -1110,6 +1135,10 @@ sub config_step1 { { 'variable' => $variable, 'value' => $form->{$variable} }; } +# Which COA is in use? + + USTVA->get_coa($form, \%myconfig); + # hä? kann die weg? my $steuernummer_new = ''; @@ -1133,6 +1162,9 @@ sub config_step1 { sub config_step2 { $lxdebug->enter_sub(); + + $auth->assert('advance_turnover_tax_return'); + $form->header(); # print qq| @@ -1247,13 +1279,10 @@ sub config_step2 { FA_voranmeld method FA_dauerfrist FA_71 elster - login password type elster_init saved callback ); - - foreach my $variable (@_hidden_form_variables) { push @{ $_hidden_variables_ref}, { 'variable' => $variable, 'value' => $form->{$variable} }; @@ -1276,6 +1305,9 @@ sub config_step2 { sub create_steuernummer { $lxdebug->enter_sub(); + + $auth->assert('advance_turnover_tax_return'); + my $part = $form->{part}; my $patterncount = $form->{patterncount}; my $delimiter = $form->{delimiter}; @@ -1312,7 +1344,11 @@ sub create_steuernummer { sub save { $lxdebug->enter_sub(); + + $auth->assert('advance_turnover_tax_return'); + my $filename = "$form->{login}_$form->{filename}"; + $filename =~ s|.*/||; #zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen create_steuernummer(); @@ -1338,27 +1374,29 @@ sub save { # 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 { @@ -1389,6 +1427,9 @@ sub back { sub elster_hash { $lxdebug->enter_sub(); + + $auth->assert('advance_turnover_tax_return'); + my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form); $lxdebug->leave_sub(); return $finanzamt;