X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=7aa371fbfc91adf9a987a0e79a427c4316b742b9;hb=5494f687372570c9d1c5eb5c6aad73767e50820a;hp=e072b27fdecab5e331c94e7ab73fc62d75323592;hpb=468b6bcf141317a5f08cbe632d23758de445bac6;p=kivitendo-erp.git diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index e072b27fd..7aa371fbf 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -1,4 +1,3 @@ -#!/bin/perl #===================================================================== # Lx-Office ERP # Copyright (c) 2004 by Udo Spallek, Aachen @@ -24,7 +23,9 @@ # German Tax authority Module and later ELSTER Interface #====================================================================== -require "bin/mozilla/arap.pl"; +use strict; +use utf8; + require "bin/mozilla/common.pl"; #use strict; @@ -35,6 +36,8 @@ require "bin/mozilla/common.pl"; #our ($myconfig); #use CGI::Carp "fatalsToBrowser"; +use List::Util qw(first); + use SL::PE; use SL::RP; use SL::USTVA; @@ -69,14 +72,16 @@ use SL::User; # $locale->text('Nov') # $locale->text('Dec') -# $form->parse_html_template('generic/util_hidden_variables'); - ############################# sub report { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub(); - my $myconfig = \%myconfig; + my $form = $::form; + my $locale = $::locale; + my %myconfig = %::myconfig; + + $::auth->assert('advance_turnover_tax_return'); $form->{title} = $locale->text('UStVA'); $form->{kz10} = ''; #Berichtigte Anmeldung? Ja =1 Nein=0 @@ -85,64 +90,57 @@ sub report { 0, 4); my $department = ''; - local $hide = ''; + my $hide = ''; $form->header; # Einlesen der Finanzamtdaten - USTVA->get_config($userspath, 'finanzamt.ini'); + my $ustva = USTVA->new(); + $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini'); # Hier Einlesen der user-config - # steuernummer entfernt für prerelease + # steuernummer entfernt für prerelease my @a = qw( - signature name company address businessnumber - tel fax email co_chief co_department + signature name company address businessnumber + tel fax email co_chief co_department co_custom1 co_custom2 co_custom3 co_custom4 co_custom5 - co_name1 co_name2 co_street co_street1 co_zip - co_city co_city1 co_country co_tel co_tel1 + co_name1 co_name2 co_street co_street1 co_zip + co_city co_city1 co_country co_tel co_tel1 co_tel2 co_fax co_fax1 co_email co_email1 - co_url co_url1 ustid duns co_bankname + co_url co_url1 ustid duns co_bankname co_bankname1 co_bankname2 co_bankname3 co_blz co_blz1 - co_blz2 co_blz3 co_accountnr co_accountnr1 co_accountnr2 + co_blz2 co_blz3 co_accountnr co_accountnr1 co_accountnr2 co_accountnr3 ); - map { $form->{$_} = $myconfig->{$_} } @a; + map { $form->{$_} = $myconfig{$_} } @a; my $openings = $form->{FA_Oeffnungszeiten}; $openings =~ s/\\\\n/
/g; - my $company_given = ($form->{company} ne '') + my $company_given = ($form->{company} ne '') ? qq|

$form->{company}

\n| - : qq|{login}| - . qq|&password=$form->{password}>| + : qq|| . $locale->text('No Company Name given') . qq|!
|; # Anpassungen der Variablennamen auf pre 2.1.1 Namen - # klären, ob $form->{company_street|_address} gesetzt sind + # 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 '' - ) - ) + my $address_given = + ($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}>| - . $locale->text('No Company Address given') + : qq|| + . $locale->text('No Company Address given') . qq|!\n|; $form->{co_email} = $form->{email} unless $form->{co_email}; @@ -150,18 +148,13 @@ 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 '') - ? qq|$form->{steuernummer}| - : qq|{login}| - . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!| - . qq|
|; + my $taxnumber_given = ($form->{steuernummer} ne '') ? $form->{steuernummer} : qq|Keine Steuernummer hinterlegt!
|; my $ustva_vorauswahl = &ustva_vorauswahl(); my @all_years = $form->all_years(\%myconfig); - my $select_year = qq||; } - $lxdebug->leave_sub(); - + $::lxdebug->leave_sub(); + return $select_vorauswahl; } #sub config { -# $lxdebug->enter_sub(); +# $::lxdebug->enter_sub(); # config_step1(); -# $lxdebug->leave_sub(); +# $::lxdebug->leave_sub(); #} sub debug { - $lxdebug->enter_sub(); - $form->debug(); - $lxdebug->leave_sub(); + $::lxdebug->enter_sub(); + $::form->debug(); + $::lxdebug->leave_sub(); } sub show_options { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub(); + + $::auth->assert('advance_turnover_tax_return'); # $form->{PD}{$form->{type}} = "selected"; # $form->{DF}{$form->{format}} = "selected"; @@ -493,25 +501,25 @@ sub show_options { my $media = qq| |; my $format = qq| |; - if ($latex_templates) { + if ($::lx_office_conf{print_templates}{latex}) { $format .= qq| |; } #my $disabled= qq|disabled="disabled"|; #$disabled='' if ($form->{elster} eq '1' ); - if ($form->{elster} eq '1') { + if ($::form->{elster} eq '1') { $format .= qq|| . qq||; + . $::locale->text('ELSTER Export (Taxbird)') + . qq||; } #$format .= qq||; @@ -519,26 +527,33 @@ sub show_options { $type $media + . $::locale->text('Choose Outputformat') . qq|">$format |; - $lxdebug->leave_sub(); - + $::lxdebug->leave_sub(); + return $show_options; } sub generate_ustva { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub(); + + my $form = $::form; + my $locale = $::locale; + my %myconfig = %::myconfig; + + $::auth->assert('advance_turnover_tax_return'); # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini - USTVA->get_config($userspath, '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' + qw('0401' '0402' '0403' + '0404' '0405' '0406' + '0407' '0408' '0409' + '0410' '0411' '0412' '0441' '0442' '0443' '0444'); foreach my $item (@anmeldungszeitraum) { @@ -552,14 +567,14 @@ sub generate_ustva { $form->current_date(\%myconfig), \%myconfig ), 0, 4); - $lxdebug->message(LXDebug::DEBUG1, + $::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"; @@ -667,12 +682,11 @@ sub generate_ustva { }; } - # Kontrollvariable für die Templates - $form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0"; - + # Kontrollvariablen für die Templates + $form->{"year$_"} = ($form->{year} >= $_ ) ? "1":"0" for 2007..2107; # Get the USTVA - USTVA->ustva(\%myconfig, \%$form); + $ustva->ustva(\%myconfig, \%$form); # reformat Dates to dateformat $form->{fromdate} = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0); @@ -686,13 +700,13 @@ sub generate_ustva { # if there are any dates construct a where if ($form->{fromdate} || $form->{todate}) { - $form->{todate} = $form->current_date($myconfig) unless ($form->{todate}); + $form->{todate} = $form->current_date(\%myconfig) unless ($form->{todate}); - my $longtodate = $locale->date($myconfig, $form->{todate}, 1, 0, 0); - my $shorttodate = $locale->date($myconfig, $form->{todate}, 0, 0, 0); + my $longtodate = $locale->date(\%myconfig, $form->{todate}, 1, 0, 0); + my $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0, 0, 0); - my $longfromdate = $locale->date($myconfig, $form->{fromdate}, 1, 0, 0); - my $shortfromdate = $locale->date($myconfig, $form->{fromdate}, 0, 0, 0); + my $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1, 0, 0); + my $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0); $form->{this_period} = "$shortfromdate
\n$shorttodate"; $form->{longperiod} = @@ -745,26 +759,26 @@ sub generate_ustva { # 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({ + 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({ + my @category_euro = $ustva->report_variables({ myconfig => \%myconfig, form => $form, type => '', @@ -783,7 +797,7 @@ sub generate_ustva { $form->{endbold} = "}"; $form->{br} = '\\\\'; - # Zahlenformatierung für Latex USTVA Formulare + # Zahlenformatierung für Latex USTVA Formulare foreach my $number (@category_euro) { $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', ''); @@ -797,7 +811,7 @@ sub generate_ustva { $form->{$number} =~ s/${decimal_comma}/~~/g; } - } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe + } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe $form->{IN} = $form->{type} . '.html'; $form->{padding} = "  "; @@ -806,38 +820,39 @@ sub generate_ustva { $form->{br} = "
"; $form->{address} =~ s/\\n/\n/g; - foreach $number (@category_cent) { + foreach my $number (@category_cent) { $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0'); } - - foreach $number (@category_euro) { + + foreach my $number (@category_euro) { $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0'); } } elsif ( $form->{format} eq 'elsterwinston' ) { $form->{IN} = 'winston.xml'; - + # # Build Winston filename # - + my $file = 'U'; # 1. char 'U' = USTVA $file .= $form->{period}; #4. and 5. char = year modulo 100 $file .= sprintf("%02d", $form->{year} % 100); #6. to 18. char = Elstersteuernummer #Beispiel: Steuernummer in Bayern - #111/222/33334 ergibt für UStVA Jan 2004: U01049111022233334 + #111/222/33334 ergibt für UStVA Jan 2004: U01049111022233334 $file .= $form->{elsterFFFF}; $file .= $form->{elstersteuernummer}; #file suffix $file .= '.xml'; - $form->{tmpfile} = "$userspath/$file"; + $file =~ s|.*/||; + $form->{tmpfile} = "$::lx_office_conf{paths}{userspath}/$file"; $form->{attachment_filename} = $file; - - # Zahlenformatierung für Winston + + # Zahlenformatierung für Winston my $temp_numberformat = $myconfig{numberformat}; @@ -848,44 +863,42 @@ sub generate_ustva { foreach my $number (@category_cent) { $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : ''; } - + foreach my $number (@category_euro) { $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : ''; } # 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->{IN} = 'taxbird.txb'; - $form->{attachment_filename} = "USTVA-" . $form->{period} + $form->{attachment_filename} = "USTVA-" . $form->{period} . sprintf("%02d", $form->{year} % 100) . ".txb"; - - $form->{tmpfile} = "$userspath/" . $form->{attachment_filename}; + + $form->{attachment_filename} =~ s|.*/||; + $form->{tmpfile} = "$::lx_office_conf{paths}{userspath}/" . $form->{attachment_filename}; # TODO: set Output to UTF-8 or system Preference #$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8"); @@ -898,57 +911,54 @@ sub generate_ustva { '43' => '14', '44' => '15', ); - + foreach my $quarter ( keys %periods ) { $form->{taxbird_period} = $periods{$quarter} if ( $form->{period} eq $quarter); } } elsif ($form->{period} =~ /^\d+$/ ) { $form->{period} =~ s/^0//g; my $period = $form->{period}; - $period * 1; + $period *= 1; $period--; - $form->{period} = $period; + $form->{taxbird_period} = $period; } else { $form->header; USTVA::error( $locale->text('Wrong Period' )); - exit(0); + ::end_of_request(); } - - my %lands = ( # Lx => taxbird # TODO: besser als array... - 'Baden Würtemberg' => '0', - 'Bayern' => '1', - 'Berlin' => '2', - 'Brandenburg' => '3', - 'Bremen' => '4', - 'Hamburg' => '5', - 'Hessen' => '6', - 'Mecklenburg Vorpommern' => '7', - 'Niedersachsen' => '8', - 'Nordrhein Westfalen' => '9', - 'Rheinland Pfalz' => '10', - 'Saarland' => '11', - 'Sachsen' => '12', - 'Sachsen Anhalt' => '13', - 'Schleswig Holstein' => '14', - 'Thüringen' => '15', - ); - foreach my $land ( keys %lands ){ - $form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land ); + + # heuristics for address splitting + # lx-office holds the entire address in a single field. + # taxbird expects it to be splitted into street, zipcode and city + if ($form->{co_street} =~ /\n/) { + my $new_co_street; + for (split /\n/, $form->{co_street}) { + if (/(\d{3,5})\s+(\w+)/) { + $form->{co_zip} = $1; + $form->{co_city} = $2; + } else { + $new_co_street .= $_; + } + } + $form->{co_street} = $new_co_street; + } else { + $form->{co_zip} = $form->{co_city}; + $form->{co_zip} =~ s/\D//g; + $form->{co_city} =~ s/\d//g; + $form->{co_city} =~ s/^\s//g; } - - $form->{co_zip} = $form->{co_city}; - $form->{co_zip} =~ s/\D//g; - $form->{co_city} =~ s/\d//g; - $form->{co_city} =~ s/^\s//g; - + + my $tax_office = first { $_->{name} eq $form->{elsterland} } @{ $ustva->{tax_office_information} }; + $form->{taxbird_land_nr} = $tax_office->{taxbird_nr} if $tax_office; + ($form->{co_phone_prefix}, $form->{co_phone}) = split("-", $form->{tel}); $form->{co_phone_prefix} =~ s/\s//g; $form->{co_phone} =~ s/\s//g; - + $form->{taxbird_steuernummer} = $form->{steuernummer}; # $form->{taxbird_steuernummer} =~ s/\D//g; - $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen - +# $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen + # Numberformatting for Taxbird my $temp_numberformat = $myconfig{numberformat}; # Numberformat must be '1000,00' for Taxbird ?! @@ -956,17 +966,17 @@ sub generate_ustva { foreach my $number (@category_cent) { $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : ''; } - + foreach my $number (@category_euro) { $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : ''; } # Re-set Numberformat $myconfig{numberformat} = $temp_numberformat; - + # push Kennziffern to <%foreach Array fo easyer # output in xml format. Thx to Moritz. my %taxbird_id_for = ( - + '511' => 'Kz51-calc', '861' => 'Kz86-calc', '971' => 'Kz97-calc', @@ -979,8 +989,8 @@ sub generate_ustva { 'Z65' => 'ust-sum+69', 'Z67' => 'ust-vz', ); - - + + for my $kennziffer (@category_cent, @category_euro) { next if ($kennziffer eq 'Z43'); @@ -989,57 +999,62 @@ sub generate_ustva { if (defined $taxbird_id_for{$kennziffer}) { push(@{ $form->{id}}, $taxbird_id_for{$kennziffer}); } else { - push(@{ $form->{id}}, "Kz$kennziffer"); + push(@{ $form->{id}}, "Kz$kennziffer"); } push(@{ $form->{amount}}, $form->{$kennziffer}); } - } - + } + } elsif ( $form->{format} eq '' ){ # No format error. $form->header; USTVA::error( $locale->text('Application Error. No Format given' ) . "!"); - exit(0); - + ::end_of_request(); + } else { # All other Formats are wrong $form->header; USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} ); - exit(0); + ::end_of_request(); } - # Austria - } elsif ($form->{coa} eq 'Austria') { - # - # Outputformat specific customisation's - # + } else # Outputformat for generic output + { + + my @category_cent = $ustva->report_variables({ + myconfig => \%myconfig, + form => $form, + type => '', + attribute => 'position', + dec_places => '2', + }); - 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 - ); - + my @category_euro = $ustva->report_variables({ + myconfig => \%myconfig, + form => $form, + type => '', + attribute => 'position', + dec_places => '0', + }); - if ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe + $form->{USTVA} = []; - $form->{IN} = $form->{type} . '.html'; - $form->{padding} = "  "; - $form->{bold} = ""; - $form->{endbold} = ""; - $form->{br} = "
"; - $form->{address} =~ s/\\n/\n/g; + if ( $form->{format} eq 'generic') { # Formatierungen für HTML Ausgabe - foreach $number (@category_euro) { - $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0'); + 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; USTVA::info( @@ -1047,79 +1062,96 @@ sub generate_ustva { 'Yearly taxreport not yet implemented') . '!'); } - + $form->{templates} = $myconfig{templates}; $form->{templates} = "doc" if ( $form->{type} eq 'help' ); - $form->parse_template(\%myconfig, $userspath); + if ($form->{format} eq 'generic'){ + + $form->header(); + + my $template_ref = { + taxnumber => $myconfig{taxnumber}, + }; + + print($form->parse_html_template('ustva/generic_taxreport', $template_ref)); - $lxdebug->leave_sub(); + } else + { + + $form->parse_template(\%myconfig, $::lx_office_conf{paths}{userspath}); + + } + + $::lxdebug->leave_sub(); } sub config_step1 { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub(); + + $::auth->assert('advance_turnover_tax_return'); + +$::form->{title} = $::locale->text('Tax Office Preferences'); # edit all taxauthority prefs - $form->header; - USTVA->get_config($userspath, 'finanzamt.ini'); + $::form->header; - my $land = $form->{elsterland}; - my $amt = $form->{elsterFFFF}; + my $ustva = USTVA->new(); + $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini'); + my $land = $::form->{elsterland}; + 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'); + $::form->{title} = $::locale->text('Tax Office Preferences'); - my $select_tax_office = USTVA->fa_auswahl($land, $amt, &elster_hash()); - my $checked_accrual = q|checked="checked"| if ($form->{method} eq 'accrual'); - my $checked_cash = q|checked="checked"| if ($form->{method} eq 'cash'); - my $checked_monthly = "checked" if ($form->{FA_voranmeld} eq 'month'); - my $checked_quarterly = "checked" if ($form->{FA_voranmeld} eq 'quarter'); - my $checked_dauerfristverlaengerung = "checked" if ($form->{FA_dauerfrist} eq '1'); - my $checked_kz_71 = "checked" if ($form->{FA_71} eq 'X'); + my $select_tax_office = $ustva->fa_auswahl($land, $amt, $ustva->query_finanzamt(\%::myconfig, $::form)); + my $checked_accrual = q|checked="checked"| if ($::form->{method} eq 'accrual'); + my $checked_cash = q|checked="checked"| if ($::form->{method} eq 'cash'); + my $checked_monthly = "checked" if ($::form->{FA_voranmeld} eq 'month'); + my $checked_quarterly = "checked" if ($::form->{FA_voranmeld} eq 'quarter'); + my $checked_dauerfristverlaengerung = "checked" if ($::form->{FA_dauerfrist} eq '1'); + my $checked_kz_71 = "checked" if ($::form->{FA_71} eq 'X'); my $_hidden_variables_ref; - my %_hidden_local_variables = ( - 'saved' => $locale->text('Check Details'), + my %_hidden_local_variables = ( + 'saved' => $::locale->text('Check Details'), 'nextsub' => 'config_step2', 'warnung' => '0', ); foreach my $variable (keys %_hidden_local_variables) { - push @{ $_hidden_variables_ref }, + push @{ $_hidden_variables_ref }, { '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_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 login password + elsterFFFF ); foreach my $variable (@_hidden_form_variables) { - push @{ $_hidden_variables_ref}, - { 'variable' => $variable, 'value' => $form->{$variable} }; + push @{ $_hidden_variables_ref}, + { 'variable' => $variable, 'value' => $::form->{$variable} }; } - # hä? kann die weg? +# Which COA is in use? + + $ustva->get_coa($::form, \%::myconfig); + + # hä? kann die weg? my $steuernummer_new = ''; - # Variablen für das Template zur Verfügung stellen + # Variablen für das Template zur Verfügung stellen my $template_ref = { select_tax_office => $select_tax_office, checked_accrual => $checked_accrual, @@ -1128,17 +1160,24 @@ sub config_step1 { checked_quarterly => $checked_quarterly, checked_dauerfristverlaengerung => $checked_dauerfristverlaengerung, hidden_variables => $_hidden_variables_ref, - + }; - + # Ausgabe des Templates - print($form->parse_html_template('ustva/config_step1', $template_ref)); + print($::form->parse_html_template('ustva/config_step1', $template_ref)); - $lxdebug->leave_sub(); + $::lxdebug->leave_sub(); } sub config_step2 { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub(); + + my $form = $::form; + my $locale = $::locale; + my %myconfig = %::myconfig; + + $::auth->assert('advance_turnover_tax_return'); + $form->header(); # print qq| @@ -1149,10 +1188,12 @@ sub config_step2 { my $elster_amt = ''; my $elsterFFFF = ''; my $elstersteuernummer = ''; - USTVA->get_config($userspath, 'finanzamt.ini') + + my $ustva = USTVA->new(); + $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini') if ($form->{saved} eq $locale->text('saved')); - # Auf Übergabefehler checken + # Auf Übergabefehler checken USTVA::info( $locale->text('Missing Tax Authoritys Preferences') . "\n" . $locale->text('USTVA-Hint: Tax Authoritys')) if ( $form->{elsterFFFF_new} eq 'Auswahl' @@ -1161,26 +1202,26 @@ sub config_step2 { . $locale->text('USTVA-Hint: Method')) if ($form->{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äderungen 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'; $change = '0' if ($form->{saved} eq $locale->text('saved')); - my $elster_init = &elster_hash(); + my $elster_init = $ustva->query_finanzamt(\%myconfig, $form); my %elster_init = %$elster_init; if ($change eq '1') { - # Daten ändern + # Daten ändern $elsterland = $form->{elsterland_new}; $elsterFFFF = $form->{elsterFFFF_new}; $form->{elsterland} = $elsterland; $form->{elsterFFFF} = $elsterFFFF; $form->{steuernummer} = ''; - + create_steuernummer(); # rebuild elster_amt @@ -1214,78 +1255,78 @@ sub config_step2 { my $patterncount = $form->{patterncount}; my $elster_pattern = $form->{elster_pattern}; my $delimiter = $form->{delimiter}; - my $steuernummer = $form->{steuernummer} if ($steuernummer eq ''); + my $steuernummer = $form->{steuernummer} if ($stnr eq ''); $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g; - - - my $input_steuernummer = USTVA->steuernummer_input( - $form->{elsterland}, + + $ustva->get_coa($form, \%myconfig); + + my $input_steuernummer = $ustva->steuernummer_input( + $form->{elsterland}, $form->{elsterFFFF}, $form->{steuernummer} ); - $lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|); - + $::lxdebug->message(LXDebug->DEBUG1, qq|$input_steuernummer|); + my $_hidden_variables_ref; my %_hidden_local_variables = ( 'elsterland' => $elsterland, 'elsterFFFF' => $elsterFFFF, - 'warnung' => $warnung, + 'warnung' => 0, 'elstersteuernummer' => $elstersteuernummer, 'steuernummer' => $stnr, 'lastsub' => 'config_step1', 'nextsub' => 'save', - + ); - + foreach my $variable (keys %_hidden_local_variables) { - push @{ $_hidden_variables_ref }, + push @{ $_hidden_variables_ref }, { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} }; } - + my @_hidden_form_variables = qw( - FA_steuerberater_name FA_steuerberater_street + FA_steuerberater_name FA_steuerberater_street FA_steuerberater_city FA_steuerberater_tel FA_voranmeld method - FA_dauerfrist FA_71 - elster - login password - type elster_init + FA_dauerfrist FA_71 + elster + type elster_init saved callback ); - - foreach my $variable (@_hidden_form_variables) { - push @{ $_hidden_variables_ref}, + push @{ $_hidden_variables_ref}, { 'variable' => $variable, 'value' => $form->{$variable} }; } my $template_ref = { - tax_office_data => $tax_office_data, input_steuernummer => $input_steuernummer, readonly => '', #q|disabled="disabled"|, - callback => $callback, + callback => $form->{callback}, hidden_variables => $_hidden_variables_ref, }; - + # Ausgabe des Templates print($form->parse_html_template('ustva/config_step2', $template_ref)); - $lxdebug->leave_sub(); + $::lxdebug->leave_sub(); } sub create_steuernummer { - $lxdebug->enter_sub(); - my $part = $form->{part}; - my $patterncount = $form->{patterncount}; - my $delimiter = $form->{delimiter}; - my $elster_pattern = $form->{elster_pattern}; + $::lxdebug->enter_sub(); + + $::auth->assert('advance_turnover_tax_return'); + + my $part = $::form->{part}; + my $patterncount = $::form->{patterncount}; + my $delimiter = $::form->{delimiter}; + my $elster_pattern = $::form->{elster_pattern}; # rebuild steuernummer and elstersteuernummer # es gibt eine gespeicherte steuernummer $form->{steuernummer} @@ -1295,109 +1336,105 @@ sub create_steuernummer { my $i = 0; my $steuernummer_new = $part; - my $elstersteuernummer_new = $form->{elster_FFFF}; + my $elstersteuernummer_new = $::form->{elster_FFFF}; $elstersteuernummer_new .= '0'; for ($h = 1; $h < $patterncount; $h++) { $steuernummer_new .= qq|$delimiter|; for (my $i = 1; $i <= length($elster_pattern); $i++) { - $steuernummer_new .= $form->{"part_$h\_$i"}; - $elstersteuernummer_new .= $form->{"part_$h\_$i"}; + $steuernummer_new .= $::form->{"part_$h\_$i"}; + $elstersteuernummer_new .= $::form->{"part_$h\_$i"}; } } - if ($form->{steuernummer} ne $steuernummer_new) { - $form->{steuernummer} = $steuernummer_new; - $form->{elstersteuernummer} = $elstersteuernummer_new; - $form->{steuernummer_new} = $steuernummer_new; + if ($::form->{steuernummer} ne $steuernummer_new) { + $::form->{steuernummer} = $steuernummer_new; + $::form->{elstersteuernummer} = $elstersteuernummer_new; + $::form->{steuernummer_new} = $steuernummer_new; } else { - $form->{steuernummer_new} = ''; - $form->{elstersteuernummer_new} = ''; + $::form->{steuernummer_new} = ''; + $::form->{elstersteuernummer_new} = ''; } - $lxdebug->leave_sub(); + $::lxdebug->leave_sub(); } sub save { - $lxdebug->enter_sub(); - my $filename = "$form->{login}_$form->{filename}"; + $::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(); # 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}; + $::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_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->{elster} = '1'; - open(CONF, ">$userspath/$filename") or $form->error("$filename : $!"); + # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer + if ($::form->{elstersteuernummer} ne '000000000') { + + $::form->{elster} = '1'; + + open my $ustvaconfig, ">", "$::lx_office_conf{paths}{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; + $::form->{$key} =~ s/\\/\\\\/g; # strip M - $form->{$key} =~ s/\r\n/\n/g; + $::form->{$key} =~ s/\r\n/\n/g; - print CONF qq|$key=|; - if ($form->{$key} ne 'Y') { - print CONF qq|$form->{$key}\n|; + print {$ustvaconfig} qq|$key=|; + if ($::form->{$key} ne 'Y') { + print {$ustvaconfig} qq|$::form->{$key}\n|; } - if ($form->{$key} eq 'Y') { - print CONF qq|checked \n|; + if ($::form->{$key} eq 'Y') { + print {$ustvaconfig} qq|checked \n|; } } - print CONF qq|\n\n|; - close CONF; - $form->{saved} = $locale->text('saved'); + print {$ustvaconfig} qq|\n\n|; + close $ustvaconfig; + $::form->{saved} = $::locale->text('saved'); } else { - $form->{saved} = $locale->text('Choose a Tax Number'); + $::form->{saved} = $::locale->text('Choose a Tax Number'); } config_step2(); - $lxdebug->leave_sub(); + $::lxdebug->leave_sub(); } sub continue { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub(); # allow Symbolic references just here: - no strict 'refs'; - call_sub($form->{"nextsub"}); - use strict 'refs'; - $lxdebug->leave_sub(); + call_sub($::form->{"nextsub"}); + $::lxdebug->leave_sub(); } sub back { - $lxdebug->enter_sub(); - call_sub($form->{"lastsub"}); - $lxdebug->leave_sub(); -} - -sub elster_hash { - $lxdebug->enter_sub(); - my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form); - $lxdebug->leave_sub(); - return $finanzamt; + $::lxdebug->enter_sub(); + call_sub($::form->{"lastsub"}); + $::lxdebug->leave_sub(); } -