X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;fp=bin%2Fmozilla%2Fustva.pl;h=0f26de3f6ab5fe4ebf9a5529bfb0d6858ca206ca;hp=b66fead82e52bd7cf7f24f9c972af48f1990df75;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hpb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44 diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index b66fead82..0f26de3f6 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -18,7 +18,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # German Tax authority Module and later ELSTER Interface # 08.01.14 ELSTER Interface software (taxbird/winston) removed @@ -29,21 +30,13 @@ use utf8; require "bin/mozilla/common.pl"; -#use strict; -#no strict 'refs'; -#use diagnostics; -#use warnings; # FATAL=> 'all'; -#use vars qw($locale $form %myconfig); -#our ($myconfig); -#use CGI::Carp "fatalsToBrowser"; - use List::Util qw(first); use SL::DB::Default; -use SL::PE; use SL::RP; use SL::USTVA; use SL::User; +use SL::Locale::String qw(t8); 1; # this is for our long dates @@ -94,11 +87,14 @@ sub report { my $department = ''; my $hide = ''; + + setup_ustva_report_action_bar(); $form->header; # Einlesen der Finanzamtdaten my $ustva = USTVA->new(); - $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini'); + $ustva->get_config(); + $ustva->get_finanzamt(); # Hier Einlesen der user-config # steuernummer entfernt für prerelease @@ -116,14 +112,13 @@ sub report { ); $form->{$_} = $myconfig{$_} for @a; - $form->{$_} = $defaults->$_ for qw(company address co_ustid duns); - my $openings = $form->{FA_Oeffnungszeiten}; + my $openings = $form->{fa_oeffnungszeiten}; $openings =~ s/\\\\n/
/g; my $company_given = ($form->{company} ne '') ? qq|

$form->{company}

\n| - : qq|| + : qq|| . $locale->text('No Company Name given') . qq|!
|; @@ -142,8 +137,7 @@ sub report { ? qq|$form->{co_street}
| . qq|$form->{co_street1}
| . qq|$form->{co_zip} $form->{co_city}| - : qq|| + : qq|| . $locale->text('No Company Address given') . qq|!\n|; @@ -152,8 +146,8 @@ sub report { $form->{co_fax} = $form->{fax} unless $form->{co_fax}; $form->{co_url} = $form->{urlx} unless $form->{co_url}; - my $taxnumber_given = ($form->{steuernummer} ne '') ? $form->{steuernummer} : qq|Keine Steuernummer hinterlegt!
|; - + my $taxnumber_given = ($form->{taxnumber} ne '') ? $form->{taxnumber} : qq|Keine Steuernummer hinterlegt!
|; + my $fa_name_given = ($form->{fa_name} ne '') ? $form->{fa_name} : qq|Kein Finanzamt hinterlegt!
|; my $ustva_vorauswahl = &ustva_vorauswahl(); my @all_years = $form->all_years(\%myconfig); @@ -171,30 +165,49 @@ sub report { $_checked = "checked" if ($form->{kz10} eq '1'); my $checkbox_kz_10 = qq|| . $locale->text('Amended Advance Turnover Tax Return'); - my $method_local = ($form->{method} eq 'accrual') ? $locale->text('accrual') - : ($form->{method} eq 'cash') ? $locale->text('cash') + $_checked = "checked" if ($form->{kz22} eq '1'); + my $checkbox_kz_22 = qq|| + . $locale->text('Receipts attached/extra'); + + $_checked = "checked" if ($form->{kz29} eq '1'); + my $checkbox_kz_29 = qq|| + . $locale->text('Accounting desired'); + + $_checked = "checked" if ($form->{kz26} eq '1'); + my $checkbox_kz_26 = qq|| + . $locale->text('Direct debit revoked'); + + my $method_local = ($form->{accounting_method} eq 'accrual') ? $locale->text('accrual') + : ($form->{accounting_method} eq 'cash') ? $locale->text('cash') : ''; - my $period_local = ( $form->{FA_voranmeld} eq 'month') ? $locale->text('month') - : ( $form->{FA_voranmeld} eq 'quarter') ? $locale->text('quarter') + my $period_local = ( $form->{fa_voranmeld} eq 'month') ? $locale->text('month') + : ( $form->{fa_voranmeld} eq 'quarter') ? $locale->text('quarter') : ''; - my $tax_office_banks_ref = [ - { BLZ => $form->{FA_BLZ_1}, - Kontonummer => $form->{FA_Kontonummer_1}, - Bankbezeichnung => $form->{FA_Bankbezeichnung_1} + my @tax_office_banks_ref = ( + { BLZ => $form->{fa_blz_1}, + Kontonummer => $form->{fa_kontonummer_1}, + Bankbezeichnung => $form->{fa_bankbezeichnung_1} }, - { BLZ => $form->{FA_BLZ_2}, - Kontonummer => $form->{FA_Kontonummer_2}, - Bankbezeichnung => $form->{FA_Bankbezeichnung_oertlich} + { BLZ => $form->{fa_blz_2}, + Kontonummer => $form->{fa_kontonummer_2}, + Bankbezeichnung => $form->{fa_bankbezeichnung_2} } - ]; - - # Which COA is in use? + ); $ustva->get_coa($form); # fetches coa and modifies some form variables @@ -203,50 +216,26 @@ sub report { company_given => $company_given, address_given => $address_given, taxnumber_given => $taxnumber_given, + fa_name_given => $fa_name_given, taxnumber => $defaults->taxnumber, select_year => $select_year, period_local => $period_local, method_local => $method_local, ustva_vorauswahl => $ustva_vorauswahl, checkbox_kz_10 => $checkbox_kz_10, - tax_office_banks => $tax_office_banks_ref, + checkbox_kz_22 => $checkbox_kz_22, + checkbox_kz_29 => $checkbox_kz_29, + checkbox_kz_26 => $checkbox_kz_26, + tax_office_banks => \@tax_office_banks_ref, select_options => &show_options, }; print($form->parse_html_template('ustva/report', $template_ref)); - - - $::lxdebug->leave_sub(); -} - - - -sub help { - $::lxdebug->enter_sub(); - - $::auth->assert('advance_turnover_tax_return'); - - # parse help documents under doc - $::form->{templates} = 'doc'; - $::form->{help} = 'ustva'; - $::form->{type} = 'help'; - $::form->{format} = 'html'; - generate_ustva(); - $::lxdebug->leave_sub(); } -sub show { - $::lxdebug->enter_sub(); - - $::auth->assert('advance_turnover_tax_return'); - - #&generate_ustva(); - $::lxdebug->leave_sub(); - call_sub($::form->{"nextsub"}); -} sub ustva_vorauswahl { $::lxdebug->enter_sub(); @@ -280,13 +269,13 @@ sub ustva_vorauswahl { #$form->{month}= '01'; #$form->{year}= 2004; $select_vorauswahl = qq| - {day}> - {month}> - - + + + + |; - if ($form->{FA_voranmeld} eq 'month') { + if ($form->{fa_voranmeld} eq 'month') { # Vorauswahl bei monatlichem Voranmeldungszeitraum @@ -311,7 +300,7 @@ sub ustva_vorauswahl { my $dfv = ''; # Offset für Dauerfristverlängerung - $dfv = '100' if ($form->{FA_dauerfrist} eq '1'); + $dfv = '100' if ($form->{fa_dauerfrist} eq '1'); SWITCH: { $yymmdd <= ($yy + 110 + $dfv) && do { @@ -382,7 +371,7 @@ sub ustva_vorauswahl { } $select_vorauswahl .= qq||; - } elsif ($form->{FA_voranmeld} eq 'quarter') { + } elsif ($form->{fa_voranmeld} eq 'quarter') { # Vorauswahl bei quartalsweisem Voranmeldungszeitraum my %liste = ('41' => $locale->text('1. Quarter'), @@ -395,7 +384,7 @@ sub ustva_vorauswahl { $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1; $sel = ''; my $dfv = ''; # Offset für Dauerfristverlängerung - $dfv = '100' if ($form->{FA_dauerfrist} eq '1'); + $dfv = '100' if ($form->{fa_dauerfrist} eq '1'); SWITCH: { $yymmdd <= ($yy + 110 + $dfv) && do { @@ -478,18 +467,6 @@ sub ustva_vorauswahl { return $select_vorauswahl; } -#sub config { -# $::lxdebug->enter_sub(); -# config_step1(); -# $::lxdebug->leave_sub(); -#} - -sub debug { - $::lxdebug->enter_sub(); - $::form->debug(); - $::lxdebug->leave_sub(); -} - sub show_options { $::lxdebug->enter_sub(); @@ -506,6 +483,16 @@ sub show_options { . $::locale->text('HTML') . qq||; + #my $disabled= qq|disabled="disabled"|; + #$disabled='' if ($form->{elster} eq '1' ); + #if ($::form->{elster} eq '1') { + if ( 1 ) { + $format .= + qq||; + } + my $show_options = qq| $type $media @@ -527,150 +514,14 @@ sub generate_ustva { $::auth->assert('advance_turnover_tax_return'); my $defaults = SL::DB::Default->get; - $form->error($::locale->text('No print templates have been created for this client yet. Please do so in the client configuration.')) if !$defaults->templates; - $form->{templates} = $defaults->templates; - - # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini my $ustva = USTVA->new(); - $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini'); - - # init some form vars - my @anmeldungszeitraum = - qw('0401' '0402' '0403' - '0404' '0405' '0406' - '0407' '0408' '0409' - '0410' '0411' '0412' - '0441' '0442' '0443' '0444'); - - foreach my $item (@anmeldungszeitraum) { - $form->{$item} = ""; - } - - #forgotten the year --> thisyear - if ($form->{year} !~ m/^\d\d\d\d$/) { - $form->{year} = substr( - $form->datetonum( - $form->current_date(\%myconfig), \%myconfig - ), - 0, 4); - $::lxdebug->message(LXDebug->DEBUG1, - qq|Actual year from Database: $form->{year}\n|); - } - - # - # using dates in ISO-8601 format: yyyymmmdd for Postgres... - # - - #yearly report - if ($form->{period} eq "13") { - $form->{fromdate} = "$form->{year}0101"; - $form->{todate} = "$form->{year}1231"; - } - - #Quater reports - if ($form->{period} eq "41") { - $form->{fromdate} = "$form->{year}0101"; - $form->{todate} = "$form->{year}0331"; - $form->{'0441'} = "X"; - } - if ($form->{period} eq "42") { - $form->{fromdate} = "$form->{year}0401"; - $form->{todate} = "$form->{year}0630"; - $form->{'0442'} = "X"; - } - if ($form->{period} eq "43") { - $form->{fromdate} = "$form->{year}0701"; - $form->{todate} = "$form->{year}0930"; - $form->{'0443'} = "X"; - } - if ($form->{period} eq "44") { - $form->{fromdate} = "$form->{year}1001"; - $form->{todate} = "$form->{year}1231"; - $form->{'0444'} = "X"; - } - - #Monthly reports - SWITCH: { - $form->{period} eq "01" && do { - $form->{fromdate} = "$form->{year}0101"; - $form->{todate} = "$form->{year}0131"; - $form->{'0401'} = "X"; - last SWITCH; - }; - $form->{period} eq "02" && do { - $form->{fromdate} = "$form->{year}0201"; + $ustva->get_config(); + $ustva->get_finanzamt(); - #this works from 1901 to 2099, 1900 and 2100 fail. - my $leap = ($form->{year} % 4 == 0) ? "29" : "28"; - $form->{todate} = "$form->{year}02$leap"; - $form->{"0402"} = "X"; - last SWITCH; - }; - $form->{period} eq "03" && do { - $form->{fromdate} = "$form->{year}0301"; - $form->{todate} = "$form->{year}0331"; - $form->{"0403"} = "X"; - last SWITCH; - }; - $form->{period} eq "04" && do { - $form->{fromdate} = "$form->{year}0401"; - $form->{todate} = "$form->{year}0430"; - $form->{"0404"} = "X"; - last SWITCH; - }; - $form->{period} eq "05" && do { - $form->{fromdate} = "$form->{year}0501"; - $form->{todate} = "$form->{year}0531"; - $form->{"0405"} = "X"; - last SWITCH; - }; - $form->{period} eq "06" && do { - $form->{fromdate} = "$form->{year}0601"; - $form->{todate} = "$form->{year}0630"; - $form->{"0406"} = "X"; - last SWITCH; - }; - $form->{period} eq "07" && do { - $form->{fromdate} = "$form->{year}0701"; - $form->{todate} = "$form->{year}0731"; - $form->{"0407"} = "X"; - last SWITCH; - }; - $form->{period} eq "08" && do { - $form->{fromdate} = "$form->{year}0801"; - $form->{todate} = "$form->{year}0831"; - $form->{"0408"} = "X"; - last SWITCH; - }; - $form->{period} eq "09" && do { - $form->{fromdate} = "$form->{year}0901"; - $form->{todate} = "$form->{year}0930"; - $form->{"0409"} = "X"; - last SWITCH; - }; - $form->{period} eq "10" && do { - $form->{fromdate} = "$form->{year}1001"; - $form->{todate} = "$form->{year}1031"; - $form->{"0410"} = "X"; - last SWITCH; - }; - $form->{period} eq "11" && do { - $form->{fromdate} = "$form->{year}1101"; - $form->{todate} = "$form->{year}1130"; - $form->{"0411"} = "X"; - last SWITCH; - }; - $form->{period} eq "12" && do { - $form->{fromdate} = "$form->{year}1201"; - $form->{todate} = "$form->{year}1231"; - $form->{"0412"} = "X"; - last SWITCH; - }; - } + # Setze Anmeldungszeitraum - # Kontrollvariablen für die Templates - $form->{"year$_"} = ($form->{year} >= $_ ) ? "1":"0" for 2007..2107; + $ustva->set_FromTo(\%$form); # Get the USTVA $ustva->ustva(\%myconfig, \%$form); @@ -737,69 +588,15 @@ sub generate_ustva { if ($form->{address} ne '') { my $temp = $form->{address}; - $temp =~ s/\\n/
/; - ($form->{co_street}, $form->{co_city}) = split("
", $temp); + $temp =~ s/\n/
/; + ($form->{co_street}, $form->{co_city}) = split("
", $temp,2); $form->{co_city} =~ s/\\n//g; } - ################################ - # - # Nation specific customisations - # - ################################ - - # Germany - - if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU') { - - # - # Outputformat specific customisation's - # - - my @category_cent = $ustva->report_variables({ - myconfig => \%myconfig, - form => $form, - type => '', - attribute => 'position', - dec_places => '2', - }); - - push @category_cent, qw(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} = []; - - if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') { - - $form->{IN} = "$form->{type}-$form->{year}.tex"; - $form->{padding} = "~~"; - $form->{bold} = "\textbf{"; - $form->{endbold} = "}"; - $form->{br} = '\\\\'; - - # Zahlenformatierung für Latex USTVA Formulare - - foreach my $number (@category_euro) { - $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', ''); - } - - my ${decimal_comma} = ( $myconfig{numberformat} eq '1.000,00' - or $myconfig{numberformat} eq '1000,00' ) ? ',':'.'; + $form->{id} = []; + $form->{amount} = []; - foreach my $number (@category_cent) { - $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', ''); - $form->{$number} =~ s/${decimal_comma}/~~/g; - } - - } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe + if ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe $form->{IN} = $form->{type} . '.html'; $form->{padding} = "  "; @@ -808,63 +605,18 @@ sub generate_ustva { $form->{br} = "
"; $form->{address} =~ s/\\n/\n/g; - foreach my $number (@category_cent) { + foreach my $number (@{$::form->{category_cent}}) { $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0'); } - foreach my $number (@category_euro) { + foreach my $number (@{$::form->{category_euro}}) { $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0'); } - } elsif ( $form->{format} eq '' ){ # No format error. - $form->header; - USTVA::error( $locale->text('Application Error. No Format given' ) . "!"); - ::end_of_request(); - - } else { # All other Formats are wrong + } else { # we have only html $form->header; USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} ); - ::end_of_request(); - } - - - } 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; - } - - } - - } - + $::dispatcher->end_request; + } if ( $form->{period} eq '13' and $form->{format} ne 'html') { $form->header; USTVA::info( @@ -873,29 +625,12 @@ sub generate_ustva { . '!'); } - $form->{templates} = "doc" if ( $form->{type} eq 'help' ); - - if ($form->{format} eq 'generic'){ - - $form->header(); - - my $template_ref = { - taxnumber => $defaults->taxnumber, - }; + # 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'); - print($form->parse_html_template('ustva/generic_taxreport', $template_ref)); - - } else - { - # 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; - print $form->parse_html_template('ustva/ustva'); - - - } + $form->header; + print $form->parse_html_template('ustva/ustva'); $::lxdebug->leave_sub(); } @@ -909,32 +644,34 @@ $::form->{title} = $::locale->text('Tax Office Preferences'); # edit all taxauthority prefs + setup_ustva_config_step1_action_bar(); + $::form->header; my $ustva = USTVA->new(); - $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini'); + $ustva->get_config(); + $ustva->get_finanzamt(); - my $land = $::form->{elsterland}; - my $amt = $::form->{elsterFFFF}; + my $land = $::form->{fa_land_nr}; + my $amt = $::form->{fa_bufa_nr}; $::form->{title} = $::locale->text('Tax Office Preferences'); my $select_tax_office = $ustva->fa_auswahl($land, $amt, $ustva->query_finanzamt(\%::myconfig, $::form)); - my $checked_accrual = $::form->{method} eq 'accrual' ? q|checked="checked"| : ''; - my $checked_cash = $::form->{method} eq 'cash' ? q|checked="checked"| : ''; - my $checked_monthly = $::form->{FA_voranmeld} eq 'month' ? "checked" : ''; - my $checked_quarterly = $::form->{FA_voranmeld} eq 'quarter' ? "checked" : ''; - my $checked_dauerfristverlaengerung = $::form->{FA_dauerfrist} eq '1' ? "checked" : ''; - my $checked_kz_71 = $::form->{FA_71} eq 'X' ? "checked" : ''; + my $method_local = ($::form->{accounting_method} eq 'accrual') ? $::locale->text('accrual') + : ($::form->{accounting_method} eq 'cash') ? $::locale->text('cash') + : ''; + + my $checked_monthly = $::form->{fa_voranmeld} eq 'month' ? "checked" : ''; + my $checked_quarterly = $::form->{fa_voranmeld} eq 'quarter' ? "checked" : ''; + my $checked_dauerfristverlaengerung = $::form->{da_dauerfrist} eq '1' ? "checked" : ''; my $_hidden_variables_ref; my %_hidden_local_variables = ( 'saved' => $::locale->text('Check Details'), - 'nextsub' => 'config_step2', - 'warnung' => '0', ); foreach my $variable (keys %_hidden_local_variables) { @@ -942,34 +679,20 @@ $::form->{title} = $::locale->text('Tax Office Preferences'); { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} }; } - my @_hidden_form_variables = qw( - FA_Name FA_Strasse FA_PLZ - FA_Ort FA_Telefon FA_Fax - FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach - FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1 - FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich - FA_Oeffnungszeiten FA_Email FA_Internet - steuernummer elsterland elstersteuernummer - elsterFFFF - ); + my @_hidden_form_variables = $ustva->get_fiamt_vars(); + push @_hidden_form_variables ,qw(fa_bufa_nr taxnumber accounting_method coa); foreach my $variable (@_hidden_form_variables) { push @{ $_hidden_variables_ref}, { 'variable' => $variable, 'value' => $::form->{$variable} }; } -# Which COA is in use? - $ustva->get_coa($::form); # fetches coa and modifies some form variables - # hä? kann die weg? - my $steuernummer_new = ''; - # Variablen für das Template zur Verfügung stellen my $template_ref = { select_tax_office => $select_tax_office, - checked_accrual => $checked_accrual, - checked_cash => $checked_cash, + method_local => $method_local, checked_monthly => $checked_monthly, checked_quarterly => $checked_quarterly, checked_dauerfristverlaengerung => $checked_dauerfristverlaengerung, @@ -992,99 +715,87 @@ sub config_step2 { $::auth->assert('advance_turnover_tax_return'); + setup_ustva_config_step2_action_bar(); + $form->header(); - my $elsterland = ''; - my $elster_amt = ''; - my $elsterFFFF = ''; - my $elstersteuernummer = ''; + my $fa_land_nr = ''; + my $fa_bufa_nr = ''; my $ustva = USTVA->new(); - $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini') - if ($form->{saved} eq $locale->text('saved')); + $ustva->get_config() if ($form->{saved} eq $locale->text('saved')); + my $coa = $::form->{coa}; + $form->{"COA_$coa"} = '1'; + $form->{COA_Germany} = '1' if ($coa =~ m/^germany/i); + $ustva->get_finanzamt(); + # Auf Übergabefehler checken USTVA::info( $locale->text('Missing Tax Authoritys Preferences') . "\n" . $locale->text('USTVA-Hint: Tax Authoritys')) - if ( $form->{elsterFFFF_new} eq 'Auswahl' - || $form->{elsterland_new} eq 'Auswahl'); + if ( $form->{fa_bufa_nr_new} eq 'Auswahl' + || $form->{fa_land_nr_new} eq 'Auswahl'); USTVA::info( $locale->text('Missing Method!') . "\n" . $locale->text('USTVA-Hint: Method')) - if ($form->{method} eq ''); + if ($form->{accounting_method} eq ''); - # Klären, ob Variablen bereits befüllt sind UND ob veräderungen auf + # Klären, ob Variablen bereits befüllt sind UND ob veränderungen auf # der vorherigen Maske stattfanden: $change = 1(in der edit sub, # mittels get_config) - my $change = $form->{elsterland} eq $form->{elsterland_new} - && $form->{elsterFFFF} eq $form->{elsterFFFF_new} ? '0' : '1'; +# $::lxdebug->message(LXDebug->DEBUG2,"land old=".$form->{fa_land_nr}." new=".$form->{fa_land_nr_new}); +# $::lxdebug->message(LXDebug->DEBUG2,"bufa old=".$form->{fa_bufa_nr}." new=".$form->{fa_bufa_nr_new}); + my $change = $form->{fa_land_nr} eq $form->{fa_land_nr_new} + && $form->{fa_bufa_nr} eq $form->{fa_bufa_nr_new} ? '0' : '1'; $change = '0' if ($form->{saved} eq $locale->text('saved')); - my $elster_init = $ustva->query_finanzamt(\%myconfig, $form); - my %elster_init = %$elster_init; if ($change eq '1') { # Daten ändern - $elsterland = $form->{elsterland_new}; - $elsterFFFF = $form->{elsterFFFF_new}; - $form->{elsterland} = $elsterland; - $form->{elsterFFFF} = $elsterFFFF; - $form->{steuernummer} = ''; + $fa_land_nr = $form->{fa_land_nr_new}; + $fa_bufa_nr = $form->{fa_bufa_nr_new}; + $form->{fa_land_nr} = $fa_land_nr; + $form->{fa_bufa_nr} = $fa_bufa_nr; + $form->{taxnumber} = ''; create_steuernummer(); # rebuild elster_amt - my $amt = $elster_init{$elsterFFFF}; - - # load the predefined hash data into the FA_* Vars - my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort - FA_Telefon FA_Fax FA_PLZ_Grosskunden FA_PLZ_Postfach - FA_Postfach - FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1 - FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich - FA_Oeffnungszeiten FA_Email FA_Internet); - - for (my $i = 0; $i <= 20; $i++) { - $form->{ $variables[$i] } = - $elster_init->{$elsterland}->{$elsterFFFF}->[$i]; - } + $ustva->get_finanzamt(); } else { - $elsterland = $form->{elsterland}; - $elsterFFFF = $form->{elsterFFFF}; + $fa_land_nr = $form->{fa_land_nr}; + $fa_bufa_nr = $form->{fa_bufa_nr}; } - my $stnr = $form->{steuernummer}; +# $::lxdebug->message(LXDebug->DEBUG2, "form stnr=".$form->{taxnumber}." fa_bufa_nr=".$fa_bufa_nr. +# " pattern=".$form->{elster_pattern}." fa_land_nr=".$fa_land_nr); + my $stnr = $form->{taxnumber}; $stnr =~ s/\D+//g; - my $patterncount = $form->{patterncount}; - my $elster_pattern = $form->{elster_pattern}; - my $delimiter = $form->{delimiter}; - my $steuernummer = $stnr eq '' ? $form->{steuernummer} : ''; + my $taxnumber = $stnr eq '' ? $form->{taxnumber} : ''; - $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g; + $form->{fa_oeffnungszeiten} =~ s/\\\\n/\n/g; $ustva->get_coa($form); # fetches coa and modifies some form variables my $input_steuernummer = $ustva->steuernummer_input( - $form->{elsterland}, - $form->{elsterFFFF}, - $form->{steuernummer} + $fa_land_nr, + $fa_bufa_nr, + $form->{taxnumber} ); - $::lxdebug->message(LXDebug->DEBUG1, qq|$input_steuernummer|); +# $::lxdebug->message(LXDebug->DEBUG2, qq|$input_steuernummer|); my $_hidden_variables_ref; my %_hidden_local_variables = ( - 'elsterland' => $elsterland, - 'elsterFFFF' => $elsterFFFF, - 'warnung' => 0, - 'elstersteuernummer' => $elstersteuernummer, - 'steuernummer' => $stnr, + 'fa_land_nr' => $fa_land_nr, + 'fa_bufa_nr' => $fa_bufa_nr, + 'taxnumber' => $stnr, 'lastsub' => 'config_step1', 'nextsub' => 'save', @@ -1096,13 +807,12 @@ sub config_step2 { } my @_hidden_form_variables = qw( - FA_steuerberater_name FA_steuerberater_street - FA_steuerberater_city FA_steuerberater_tel - FA_voranmeld method - FA_dauerfrist FA_71 - elster - type elster_init - saved callback + fa_dauerfrist fa_steuerberater_city fa_steuerberater_name + fa_steuerberater_street fa_steuerberater_tel + fa_voranmeld fa_dauerfrist + accounting_method + type + saved ); foreach my $variable (@_hidden_form_variables) { @@ -1113,7 +823,7 @@ sub config_step2 { my $template_ref = { input_steuernummer => $input_steuernummer, readonly => '', #q|disabled="disabled"|, - callback => $form->{callback}, + COA_Germany => $form->{COA_Germany}, hidden_variables => $_hidden_variables_ref, }; @@ -1131,34 +841,31 @@ sub create_steuernummer { my $part = $::form->{part}; my $patterncount = $::form->{patterncount}; - my $delimiter = $::form->{delimiter}; + my $delimiter = $::form->{delimiter1}; my $elster_pattern = $::form->{elster_pattern}; - # rebuild steuernummer and elstersteuernummer - # es gibt eine gespeicherte steuernummer $form->{steuernummer} + # rebuild taxnumber + # es gibt eine gespeicherte steuernummer $form->{taxnumber} # und die parts und delimiter my $h = 0; my $i = 0; - my $steuernummer_new = $part; - my $elstersteuernummer_new = $::form->{elster_FFFF}; - $elstersteuernummer_new .= '0'; + my $taxnumber_new = $part; for ($h = 1; $h < $patterncount; $h++) { - $steuernummer_new .= qq|$delimiter|; + $delimiter = $::form->{delimiter2} if $h > 1; + $taxnumber_new .= qq|$delimiter|; for (my $i = 1; $i <= length($elster_pattern); $i++) { - $steuernummer_new .= $::form->{"part_$h\_$i"}; - $elstersteuernummer_new .= $::form->{"part_$h\_$i"}; + $taxnumber_new .= $::form->{"part_$h\_$i"}; } } - if ($::form->{steuernummer} ne $steuernummer_new) { - $::form->{steuernummer} = $steuernummer_new; - $::form->{elstersteuernummer} = $elstersteuernummer_new; - $::form->{steuernummer_new} = $steuernummer_new; +# $::lxdebug->message(LXDebug->DEBUG2, "oldstnr=".$::form->{taxnumber}." newstnr=".$taxnumber_new); + if ($::form->{taxnumber} ne $taxnumber_new) { + $::form->{taxnumber} = $taxnumber_new; + $::form->{taxnumber_new} = $taxnumber_new; } else { - $::form->{steuernummer_new} = ''; - $::form->{elstersteuernummer_new} = ''; + $::form->{taxnumber_new} = ''; } $::lxdebug->leave_sub(); } @@ -1168,56 +875,23 @@ sub save { $::auth->assert('advance_turnover_tax_return'); - my $filename = "$::myconfig{login}_$::form->{filename}"; - $filename =~ s|.*/||; - #zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen create_steuernummer(); # Textboxen formatieren: Linebreaks entfernen # - $::form->{FA_Oeffnungszeiten} =~ s/\r\n/\\n/g; + $::form->{fa_oeffnungszeiten} =~ s/\r\n/\\n/g; #URL mit http:// davor? - $::form->{FA_Internet} =~ s/^http:\/\///; - $::form->{FA_Internet} = 'http://' . $::form->{FA_Internet}; - - my @config = qw( - elster elsterland elstersteuernummer steuernummer - elsteramt elsterFFFF FA_Name FA_Strasse - FA_PLZ FA_Ort FA_Telefon FA_Fax - FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach FA_BLZ_1 - FA_Kontonummer_1 FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2 - FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten - FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name - FA_steuerberater_street FA_steuerberater_city FA_steuerberater_tel - FA_71 FA_dauerfrist); - - # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer - if ($::form->{elstersteuernummer} ne '000000000') { + $::form->{fa_internet} =~ s/^http:\/\///; + $::form->{fa_internet} = 'http://' . $::form->{fa_internet}; - $::form->{elster} = '1'; + # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer TODO ?? + if (1) { + my $ustva = USTVA->new(); + $ustva->save_config(); - open my $ustvaconfig, ">", "$::lx_office_conf{paths}{userspath}/$filename" or $::form->error("$filename : $!"); - - # create the config file - 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 {$ustvaconfig} qq|$key=|; - if ($::form->{$key} ne 'Y') { - print {$ustvaconfig} qq|$::form->{$key}\n|; - } - if ($::form->{$key} eq 'Y') { - print {$ustvaconfig} qq|checked \n|; - } - } - print {$ustvaconfig} qq|\n\n|; - close $ustvaconfig; + #$::form->{elster} = '1'; $::form->{saved} = $::locale->text('saved'); } else { @@ -1243,3 +917,49 @@ sub back { call_sub($::form->{"lastsub"}); $::lxdebug->leave_sub(); } + +sub setup_ustva_report_action_bar { + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Show'), + submit => [ '#form_do', { action => 'generate_ustva' } ], + accesskey => 'enter', + ], + action => [ + t8('Geierlein'), + call => [ 'sendGeierlein' ], + disabled => !length($::lx_office_conf{paths}{geierlein_path} // '') ? t8('The Geierlein path has not been set in the configuration.') : undef, + tooltip => t8('Transfer data to Geierlein ELSTER application'), + ], + ); + } +} + +sub setup_ustva_config_step1_action_bar { + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Continue'), + submit => [ '#form', { action => 'config_step2' } ], + accesskey => 'enter', + ], + ); + } +} + +sub setup_ustva_config_step2_action_bar { + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Save'), + submit => [ '#form', { action => 'save' } ], + accesskey => 'enter', + ], + action => [ + t8('Back'), + call => [ 'kivi.history_back' ], + ], + ); + } +}