X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=4229d24c30a3c40d0eb17602ab5f8c91ff09270b;hb=f559ec45ea2fc09c361ef7e4a40a59b1f2133737;hp=bf9aaecb33ae45728989bc9affadf8fd87f07a80;hpb=d726f05aa693408c45d0128b98738cbfce53cb0e;p=kivitendo-erp.git diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index bf9aaecb3..4229d24c3 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -24,7 +24,8 @@ # German Tax authority Module and later ELSTER Interface #====================================================================== -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; +require "bin/mozilla/common.pl"; #use strict; #no strict 'refs'; @@ -67,82 +68,59 @@ use SL::User; # $locale->text('Oct') # $locale->text('Nov') # $locale->text('Dec') + +# $form->parse_html_template('generic/util_hidden_variables'); + ############################# sub report { $lxdebug->enter_sub(); + my $myconfig = \%myconfig; - use CGI; $form->{title} = $locale->text('UStVA'); $form->{kz10} = ''; #Berichtigte Anmeldung? Ja =1 Nein=0 - my $year = substr( - $form->datetonum($form->current_date(\%myconfig), - \%myconfig - ), - 0, 4); + my $year = substr($form->datetonum($form->current_date(\%myconfig), \%myconfig ), + 0, 4); my $department = ''; local $hide = ''; $form->header; - print qq| - -
{script}> - - - - - - - - - - - - - - -
$form->{title}
- - $department -|; - - # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum # Einlesen der Finanzamtdaten - &get_config($userspath, 'finanzamt.ini'); + USTVA->get_config($userspath, 'finanzamt.ini'); # Hier Einlesen der user-config # steuernummer entfernt für prerelease - my @a = qw(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_tel2 - co_fax co_fax1 co_email co_email1 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_accountnr3); + my @a = qw( + 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_tel2 co_fax co_fax1 co_email co_email1 + 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_accountnr3 + ); map { $form->{$_} = $myconfig->{$_} } @a; - my $oeffnungszeiten = $form->{FA_Oeffnungszeiten}; - $oeffnungszeiten =~ s/\\\\n/
/g; - print qq| - - |; - - if ($form->{FA_Name} ne '') { - print qq| - - - |; - #}# end if report = ustva - - print qq| -
-
- - | . $locale->text('Firma') . qq| - - |; - if ($form->{company} ne '') { - print qq|

$form->{company}

\n|; - } else { - print qq| - {path}&action=config&level=Programm--Preferences&login=$form->{login}&password=$form->{password}> - | . $locale->text('Kein Firmenname hinterlegt!') . qq|
- |; - } + my $openings = $form->{FA_Oeffnungszeiten}; + $openings =~ s/\\\\n/
/g; + + my $company_given = ($form->{company} ne '') + ? qq|

$form->{company}

\n| + : qq|{login}| + . qq|&password=$form->{password}>| + . $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 - # - if ($form->{address} ne '') { my $temp = $form->{address}; $temp =~ s/\\n/
/; @@ -150,342 +128,103 @@ sub report { $form->{co_city} =~ s/\\n//g; } - if ($form->{co_street} ne '' - and ( $form->{co_zip} ne '' - or $form->{co_city} ne '') - ) { - print qq| - $form->{co_street}
- $form->{co_street1}
- $form->{co_zip} $form->{co_city}|; - } else { - print qq| - {path}&action=config&level=Programm--Preferences&login=$form->{login}&password=$form->{password}> - | . $locale->text('Keine Firmenadresse hinterlegt!') . qq|\n|; - } + + my $address_given = + ($form->{co_street} ne '' + and ( + $form->{co_zip} ne '' + or $form->{co_city} ne '' + ) + ) + ? 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|!\n|; + $form->{co_email} = $form->{email} unless $form->{co_email}; $form->{co_tel} = $form->{tel} unless $form->{co_tel}; $form->{co_fax} = $form->{fax} unless $form->{co_fax}; $form->{co_url} = $form->{urlx} unless $form->{co_url}; - print qq| -
-
- | . $locale->text('Tel.: ') . qq| - $form->{co_tel} -
- | . $locale->text('Fax.: ') . qq| - $form->{co_fax} -
-
- $form->{co_email} -
-
- | . $locale->text('Steuernummer: ') . qq| - |; - - if ($form->{steuernummer} ne '') { - print qq|$form->{steuernummer}|; - } else { - print qq| - - Keine Steuernummer hinterlegt!
|; - } - print qq| -
- | . $locale->text('ELSTER-Steuernummer: ') . qq| - $form->{elstersteuernummer} -
-
- -
-
- |; - if ($form->{FA_steuerberater_name} ne '') { - print qq| -
- -   - | . $locale->text('Steuerberater/-in') . qq| - - - $form->{FA_steuerberater_name}
- $form->{FA_steuerberater_street}
- $form->{FA_steuerberater_city}
- Tel: $form->{FA_steuerberater_tel}
-
-
- |; - } - print qq| -
- - | . $locale->text('Voranmeldezeitraum') . qq| - - |; - &ustva_vorauswahl(); - - my @years = (); - if (not defined $form->{all_years}) { + my $taxnumber_given = ($form->{steuernummer} ne '') + ? qq|$form->{steuernummer}| + : qq|{login}| + . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!| + . qq|
|; - # accounting years if SQL-Ledger Version < 2.4.1 - # $year = $form->{year} * 1; - @years = sort { $b <=> $a } (2003 .. ($year + 1)); - $form->{all_years} = \@years; - } - map { $form->{selectaccountingyear} .= qq|
 -
- - | . $locale->text('Finanzamt') . qq| - -

$form->{FA_Name}

- |; - - #if ($form->{FA_Ergaenzung_Name ne ''}){ - # print qq| - # $form->{FA_Ergaenzung_Name}  - #
- # |; - #} - print qq| - $form->{FA_Strasse} -
- $form->{FA_PLZ}   $form->{FA_Ort} -
-
- | . $locale->text('Tel. : ') . qq| - $form->{FA_Telefon} -
- | . $locale->text('Fax. : ') . qq| - $form->{FA_Fax} -
-
- {steuernummer}:") - . qq|&body=| - . CGI::escape( - "Sehr geehrte Damen und Herren,\n\n\nMit freundlichen Grüßen\n\n") - . CGI::escape($form->{signature}) . qq|"> - $form->{FA_Email} - -
- - $form->{FA_Internet} - -
-
- | . $locale->text('Öffnungszeiten') . qq| -
- $oeffnungszeiten -
- |; - - my $FA_1 = - ( $form->{FA_BLZ_1} ne '' - && $form->{FA_Kontonummer_1} ne '' - && $form->{FA_Bankbezeichnung_1} ne ''); - my $FA_2 = - ( $form->{FA_BLZ_2} ne '' - && $form->{FA_Kontonummer_2} ne '' - && $form->{FA_Bankbezeichnung_oertlich} ne ''); - - if ($FA_1 && $FA_2) { - print qq| -
- | . $locale->text('Bankverbindungen') . qq| - - - - - -
- $form->{FA_Bankbezeichnung_1} -
- | . $locale->text('Konto: ') . qq| - $form->{FA_Kontonummer_1} -
- | . $locale->text('BLZ: ') . qq| - $form->{FA_BLZ_1} - 		- $form->{FA_Bankbezeichnung_oertlich} -
- | . $locale->text('Konto: ') . qq| - $form->{FA_Kontonummer_2} -
- | . $locale->text('BLZ: ') . qq| - $form->{FA_BLZ_2} -
-
|; - } elsif ($FA_1) { - print qq| -
- | . $locale->text('Bankverbindung') . qq| -
-
- $form->{FA_Bankbezeichnung_1} -
- | . $locale->text('Konto: ') . qq| - $form->{FA_Kontonummer_1} -
- | . $locale->text('BLZ: ') . qq| - $form->{FA_BLZ_1}
-
|; - } elsif ($FA_2) { - print qq| -
- | . $locale->text('Bankverbindung') . qq| -
-
- $form->{FA_Bankbezeichnung_oertlich} -
- | . $locale->text('Konto: ') . qq| - $form->{FA_Kontonummer_2} -
- | . $locale->text('BLZ: ') . qq| - $form->{FA_BLZ_2} - |; + $select_year .= qq||; + + my $_checked = ''; + $_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') + : ''; + + 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} + }, + { BLZ => $form->{FA_BLZ_2}, + Kontonummer => $form->{FA_Kontonummer_2}, + Bankbezeichnung => $form->{FA_Bankbezeichnung_oertlich} } - print qq| - -
-
-
- - | . $locale->text('Ausgabeformat') . qq| - - |; - - &show_options; - my $ausgabe = '1'; - print qq| -
- |; - - } else { - print qq| - 		-
- - | . $locale->text('Hinweise') . qq| - -

| - . $locale->text('Missing Preferences: Outputroutine disabled') - . qq|

-

| . $locale->text('Help:') . qq|

-
    -
  • | . $locale->text('Hint-Missing-Preferences') . qq|
    • -
-
- |; - my $ausgabe = ''; - $hide = q|disabled="disabled"|; - } + ]; + + # 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, + ustva_vorauswahl => $ustva_vorauswahl, + 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)); - print qq| -
-
- -
- - - - - - - - - - - - -
- - - - - - - -
- |; - print qq| - - - - |; $lxdebug->leave_sub(); } -############################# + sub help { $lxdebug->enter_sub(); @@ -508,13 +247,15 @@ sub show { #&generate_ustva(); no strict 'refs'; $lxdebug->leave_sub(); - &{ $form->{nextsub} }; + call_sub($form->{"nextsub"}); use strict 'refs'; } sub ustva_vorauswahl { $lxdebug->enter_sub(); + my $select_vorauswahl; + #Aktuelles Datum zerlegen: my $date = $form->datetonum($form->current_date(\%myconfig), \%myconfig); @@ -535,12 +276,12 @@ sub ustva_vorauswahl { #$form->{day}= '11'; #$form->{month}= '01'; #$form->{year}= 2004; - print qq| + $select_vorauswahl = qq| {day}> {month}> - |; + |; if ($form->{FA_voranmeld} eq 'month') { @@ -625,18 +366,18 @@ sub ustva_vorauswahl { }; } - print qq||; + $select_vorauswahl .= qq||; } elsif ($form->{FA_voranmeld} eq 'quarter') { @@ -656,43 +397,43 @@ sub ustva_vorauswahl { SWITCH: { $yymmdd <= ($yy + 110 + $dfv) && do { $form->{year} = $form->{year} - 1; - $sel = 'D'; + $sel = '44'; last SWITCH; }; $yymmdd <= ($yy + 410 + $dfv) && do { - $sel = 'A'; + $sel = '41'; last SWITCH; }; $yymmdd <= ($yy + 710 + $dfv) && do { - $sel = 'B'; + $sel = '42'; last SWITCH; }; $yymmdd <= ($yy + 1010 + $dfv) && do { - $sel = 'C'; + $sel = '43'; last SWITCH; }; $yymmdd <= ($yy + 1231) && do { - $sel = 'D'; + $sel = '44'; }; } - print qq| + $select_vorauswahl .= qq|\n |; } else { # keine Vorauswahl bei Voranmeldungszeitraum - print qq||; + $select_vorauswahl .= qq||; } $lxdebug->leave_sub(); + + return $select_vorauswahl; } -sub config { - $lxdebug->enter_sub(); - edit(); - $lxdebug->leave_sub(); -} +#sub config { +# $lxdebug->enter_sub(); +# config_step1(); +# $lxdebug->leave_sub(); +#} sub debug { $lxdebug->enter_sub(); @@ -755,12 +498,12 @@ sub show_options { my $media = qq| |; my $format = qq| |; if ($latex_templates) { $format .= qq| |; } @@ -769,34 +512,40 @@ sub show_options { if ($form->{elster} eq '1') { $format .= qq|| . qq||; } #$format .= qq||; - print qq| + my $show_options = qq| $type $media + . $locale->text('Choose Outputformat') . qq|">$format |; $lxdebug->leave_sub(); + + return $show_options; } sub generate_ustva { $lxdebug->enter_sub(); - # Aufruf von get_config aus bin/mozilla/ustva.pl zum - # Einlesen der Finanzamtdaten aus finanzamt.ini + # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini - get_config($userspath, 'finanzamt.ini'); + USTVA->get_config($userspath, 'finanzamt.ini'); - # form vars initialisieren + # init some form vars my @anmeldungszeitraum = - qw('0401' '0402' '0403' '0404' '0405' '0405' '0406' '0407' '0408' '0409' '0410' '0411' '0412' '0441' '0442' '0443' '0444'); + qw('0401' '0402' '0403' + '0404' '0405' '0406' + '0407' '0408' '0409' + '0410' '0411' '0412' + '0441' '0442' '0443' '0444'); + foreach my $item (@anmeldungszeitraum) { $form->{$item} = ""; } @@ -812,6 +561,10 @@ sub generate_ustva { 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"; @@ -919,13 +672,17 @@ sub generate_ustva { }; } - # using dates in ISO-8601 format: yyyymmmdd for Postgres... + # Kontrollvariable für die Templates + $form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0"; + + + # Get the USTVA USTVA->ustva(\%myconfig, \%$form); # reformat Dates to dateformat $form->{fromdate} = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0); - $form->{todate} = $form->current_date($myconfig) unless $form->{todate}; + $form->{todate} = $form->current_date(\%myconfig) unless $form->{todate}; $form->{todate} = $locale->date(\%myconfig, $form->{todate}, 0, 0, 0); $form->{longperiod} = @@ -946,7 +703,7 @@ sub generate_ustva { $form->{longperiod} = $locale->text('for Period') . qq|
\n$longfromdate | - . $locale->text('bis') + . $locale->text('to (date)') . qq| $longtodate|; } @@ -964,7 +721,7 @@ sub generate_ustva { $form->{last_period} = "$shortcomparefromdate
\n$shortcomparetodate"; $form->{longperiod} .= "
\n$longcomparefromdate " - . $locale->text('bis') + . $locale->text('to (date)') . qq| $longcomparetodate|; } @@ -972,7 +729,6 @@ sub generate_ustva { $locale->date(\%myconfig, $form->current_date(\%myconfig), 0, 0, 0); # setup variables for the form - # steuernummer für prerelease entfernt my @a = qw(company 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_tel2 @@ -989,67 +745,88 @@ sub generate_ustva { $form->{co_city} =~ s/\\n//g; } - if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') { + ################################ + # + # 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(83 Z43 Z45 Z53 Z62 Z65 Z67); + + my @category_euro = USTVA->report_variables({ + myconfig => \%myconfig, + form => $form, + type => '', + attribute => 'position', + dec_places => '0', + }); - $form->{IN} = "$form->{type}-$form->{year}.tex"; + $form->{id} = []; + $form->{amount} = []; - $form->{padding} = "~~"; - $form->{bold} = "\textbf{"; - $form->{endbold} = "}"; - $form->{br} = '\\\\'; + if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') { - my @numbers = qw(511 861 36 80 971 931 98 96 53 74 - 85 65 66 61 62 Z67 63 64 59 69 39 83 - Z43 Z45 Z53 Z62 Z65); + $form->{IN} = "$form->{type}-$form->{year}.tex"; + $form->{padding} = "~~"; + $form->{bold} = "\textbf{"; + $form->{endbold} = "}"; + $form->{br} = '\\\\'; - my $number = ''; + # Zahlenformatierung für Latex USTVA Formulare - # Zahlenformatierung für Latex USTVA Formulare - if ( $myconfig{numberformat} eq '1.000,00' - or $myconfig{numberformat} eq '1000,00') { - foreach $number (@numbers) { - $form->{$number} =~ s/,/~~/g; + foreach my $number (@category_euro) { + $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', ''); } - } - if ( $myconfig{numberformat} eq '1000.00' - or $myconfig{numberformat} eq '1,000.00') { - foreach $number (@numbers) { - $form->{$number} =~ s/\./~~/g; + + my ${decimal_comma} = ( $myconfig{numberformat} eq '1.000,00' + or $myconfig{numberformat} eq '1000,00' ) ? ',':'.'; + + foreach my $number (@category_cent) { + $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', ''); + $form->{$number} =~ s/${decimal_comma}/~~/g; } - } - if ( $form->{period} eq '13'){ #Catch yearly USTE for now, not yet implemented. - $form->header; - USTVA::error( - $locale->text( - 'Impossible to create yearly Tax Report as PDF or Postscript
Not yet implemented!' - ) - ); - } - - } elsif ( $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/
/g; + } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe - } elsif ($form->{format} =~ /^elster/) { + $form->{IN} = $form->{type} . '.html'; + $form->{padding} = "  "; + $form->{bold} = ""; + $form->{endbold} = ""; + $form->{br} = "
"; + $form->{address} =~ s/\\n/\n/g; - if ( $form->{period} eq '13' ) { - $form->header; - USTVA::info( - $locale->text( - 'Impossible to create yearly Tax Report via Winston or Taxbird.
Not yet implemented!' - )); - } + foreach $number (@category_cent) { + $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0'); + } + + foreach $number (@category_euro) { + $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0'); + } - if ( $form->{format} eq 'elsterwinston' ) { + } 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 @@ -1061,16 +838,63 @@ sub generate_ustva { $file .= $form->{elstersteuernummer}; #file suffix $file .= '.xml'; + $file =~ s|.*/||; $form->{tmpfile} = "$userspath/$file"; - } - if ( $form->{format} eq 'elstertaxbird' ) { + $form->{attachment_filename} = $file; + + # Zahlenformatierung für Winston + + my $temp_numberformat = $myconfig{numberformat}; + + # Numberformat must be '1000.00' for Winston + + $myconfig{numberformat} = '1000.00'; + + 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?! + ); + + 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}}, "Kz$kennziffer"); + } + push(@{ $form->{amount}}, $form->{$kennziffer}); + } + + } elsif ( $form->{format} eq 'elstertaxbird' ) { + # Define serveral filenames $form->{IN} = 'taxbird.txb'; - - $form->{tmpfile} = "$userspath/USTVA-" . $form->{period} + + $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 + #$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8"); + #my $iconv = $self->{"iconv"}; + #$iconv->convert($variable); if ($form->{period} =~ /^[4]\d$/ ){ my %periods = ( # Lx => taxbird '41' => '12', @@ -1080,31 +904,7 @@ sub generate_ustva { ); foreach my $quarter ( keys %periods ) { - $form->{period} = $periods{$quarter} if ( $form->{period} eq $quarter); - } - - 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->{elsterland} = $lands{$land} if ($form->{elsterland} eq $land ); + $form->{taxbird_period} = $periods{$quarter} if ( $form->{period} eq $quarter); } } elsif ($form->{period} =~ /^\d+$/ ) { $form->{period} =~ s/^0//g; @@ -1112,237 +912,273 @@ sub generate_ustva { $period * 1; $period--; $form->{period} = $period; - } else { - $form->header; - USTVA::error( $locale->text('Wrong Period' )); - exit(0); - - } + } else { + $form->header; + USTVA::error( $locale->text('Wrong Period' )); + exit(0); + } + + 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 ); + } + + $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_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 + + # Numberformatting for Taxbird + my $temp_numberformat = $myconfig{numberformat}; + # Numberformat must be '1000,00' for Taxbird ?! + $myconfig{numberformat} = '1000,00'; + 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', + '931' => 'Kz93-calc', + '811' => 'Kz81-calc', + '891' => 'Kz89-calc', + 'Z45' => 'uebertrag', + 'Z53' => 'ust-sum', + 'Z62' => 'ust-minus-vost', + 'Z65' => 'ust-sum+69', + 'Z67' => 'ust-vz', + ); + + + for my $kennziffer (@category_cent, @category_euro) { + + next if ($kennziffer eq 'Z43'); + + if ($form->{$kennziffer} != 0){ + if (defined $taxbird_id_for{$kennziffer}) { + push(@{ $form->{id}}, $taxbird_id_for{$kennziffer}); + } else { + 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); + + } else { # All other Formats are wrong + $form->header; + USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} ); + exit(0); } - # Other Elster formats follow here... - - } elsif ( $form->{format} eq '' ){ # No format error. - $form->header; - USTVA::error( $locale->text('Application Error. No Format given!' )); - exit(0); - - } else { # All other Formats are wrong + + + } 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; + } + + } + + } + + if ( $form->{period} eq '13' and $form->{format} ne 'html') { $form->header; - USTVA::error( $locale->text('Application Error. Wrong Format: ') . $form->{format} ); - exit(0); + USTVA::info( + $locale->text( + '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(); + + $template_ref = { + taxnumber => $myconfig{taxnumber}, + }; + + print($form->parse_html_template2('ustva/generic_taxreport', $template_ref)); + + } else + { + + $form->parse_template(\%myconfig, $userspath); + + } $lxdebug->leave_sub(); } -sub edit { +sub config_step1 { $lxdebug->enter_sub(); # edit all taxauthority prefs $form->header; - &get_config($userspath, 'finanzamt.ini'); - - #&create_steuernummer; + USTVA->get_config($userspath, 'finanzamt.ini'); my $land = $form->{elsterland}; my $amt = $form->{elsterFFFF}; - my $callback = ''; - $callback = - "$form->{cbscript}?action=edit&login=$form->{cblogin}&path=$form->{cbpath}&root=$form->{cbroot}&rpw=$form->{cbrpw}" - if ($form->{cbscript} ne '' and $form->{cblogin} ne ''); - - $form->{title} = $locale->text('Finanzamt - Einstellungen'); - print qq| - - - - - - - - - -
| - . $locale->text('Finanzamt - Einstellungen') . qq|
-
-
- | - . $locale->text('Angaben zum Finanzamt') . qq| - |; - #print qq|$form->{terminal}|; + 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}"|; + } - USTVA::fa_auswahl($land, $amt, &elster_hash()); - print qq| -
-
- |; - my $checked = ''; - $checked = "checked" if ($form->{method} eq 'accrual'); - print qq| -
- | . $locale->text('Verfahren') . qq| - - - -
- |; - $checked = ''; - $checked = "checked" if ($form->{method} eq 'cash'); - print qq| - - -
-
-
- | . $locale->text('Voranmeldungszeitraum') . qq| - - |; - $checked = ''; - $checked = "checked" if ($form->{FA_voranmeld} eq 'month'); - print qq| - - -
- |; - $checked = ''; - $checked = "checked" if ($form->{FA_voranmeld} eq 'quarter'); - print qq| - - -
- |; - $checked = ''; - $checked = "checked" if ($form->{FA_dauerfrist} eq '1'); - print qq| - - - -
-
-
- | . $locale->text('Steuerberater/-in') . qq| - - |; - $checked = ''; - $checked = "checked" if ($form->{FA_71} eq 'X'); - print qq| - - - - - - - - - - - - - -
- | . $locale->text('Name') . qq| - - | . $locale->text('Straße') . qq| - - | . $locale->text('PLZ, Ort') . qq| - - | . $locale->text('Telefon') . qq| -
- - - - - - - -
- -
- -
-
-
- - |; - print qq| - | if ($callback ne ''); - print qq| -     - - -
- |; + $form->{title} = $locale->text('Tax Office Preferences'); - my @variables = qw( steuernummer elsterland elstersteuernummer elsterFFFF); - my $variable = ''; - foreach $variable (@variables) { - print qq| - |; - } - my $steuernummer_new = ''; - # - print qq| - - - - - {path}> - {login}> - {password}> - - |; + 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 $_hidden_variables_ref; - @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); + my %_hidden_local_variables = ( + 'saved' => $locale->text('Check Details'), + 'nextsub' => 'config_step2', + 'warnung' => '0', + ); - foreach $variable (@variables) { - print qq| - |; + foreach my $variable (keys %_hidden_local_variables) { + push @{ $_hidden_variables_ref }, + { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} }; } - print qq| -
- -|; + 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 login password + ); + + foreach my $variable (@_hidden_form_variables) { + push @{ $_hidden_variables_ref}, + { 'variable' => $variable, 'value' => $form->{$variable} }; + } + +# 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 + my $template_ref = { + select_tax_office => $select_tax_office, + checked_accrual => $checked_accrual, + checked_cash => $checked_cash, + checked_monthly => $checked_monthly, + 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)); + $lxdebug->leave_sub(); } -sub edit_form { +sub config_step2 { $lxdebug->enter_sub(); $form->header(); - print qq| - - |; + +# print qq| +# +# |; + my $elsterland = ''; my $elster_amt = ''; my $elsterFFFF = ''; my $elstersteuernummer = ''; - &get_config($userspath, 'finanzamt.ini') + USTVA->get_config($userspath, 'finanzamt.ini') if ($form->{saved} eq $locale->text('saved')); # Auf Übergabefehler checken @@ -1363,7 +1199,6 @@ sub edit_form { $change = '0' if ($form->{saved} eq $locale->text('saved')); my $elster_init = &elster_hash(); - #my %elster_init = (); my %elster_init = %$elster_init; if ($change eq '1') { @@ -1374,7 +1209,8 @@ sub edit_form { $form->{elsterland} = $elsterland; $form->{elsterFFFF} = $elsterFFFF; $form->{steuernummer} = ''; - &create_steuernummer; + + create_steuernummer(); # rebuild elster_amt my $amt = ''; @@ -1407,109 +1243,67 @@ sub edit_form { my $patterncount = $form->{patterncount}; my $elster_pattern = $form->{elster_pattern}; my $delimiter = $form->{delimiter}; - my $steuernummer = ''; - $steuernummer = $form->{steuernummer} if ($steuernummer eq ''); - - #Warnung - my $warnung = $form->{warnung}; - - #printout form - print qq| -
- - - - - - - - - - - - - - -
| - . $locale->text('Finanzamt - Einstellungen') . qq|
-
- |; - &show_fa_daten; - print qq| -
-
-
- - | . $locale->text('Steuernummer') . qq| - -
- |; - $steuernummer = - USTVA::steuernummer_input($form->{elsterland}, $form->{elsterFFFF}, - $form->{steuernummer}); - print qq| -
-
-
-
-
-
- - - |; - print qq|| - if ($form->{callback} eq ''); - - print qq| - | - if ($form->{callback} ne ''); - - if ($form->{warnung} eq "1") { - print qq| - - - - |; - } else { - print qq| - - - - |; - } + my $steuernummer = $form->{steuernummer} if ($steuernummer eq ''); - print qq| - -

$form->{saved}

-
- |; + $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g; + + + + my $input_steuernummer = USTVA->steuernummer_input( + $form->{elsterland}, + $form->{elsterFFFF}, + $form->{steuernummer} + ); + + $lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|); + + + my $_hidden_variables_ref; - my @variables = qw(FA_steuerberater_name FA_steuerberater_street - FA_steuerberater_city FA_steuerberater_tel - FA_voranmeld method - FA_dauerfrist FA_71 elster - path login password type elster_init saved + my %_hidden_local_variables = ( + 'elsterland' => $elsterland, + 'elsterFFFF' => $elsterFFFF, + 'warnung' => $warnung, + 'elstersteuernummer' => $elstersteuernummer, + 'steuernummer' => $stnr, + 'lastsub' => 'config_step1', + 'nextsub' => 'save', + ); - my $variable = ''; - foreach $variable (@variables) { - print qq| - |; + + foreach my $variable (keys %_hidden_local_variables) { + push @{ $_hidden_variables_ref }, + { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} }; } - print qq| - - - - - - -
- |; + + 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 + login password + type elster_init + saved callback + ); + + foreach my $variable (@_hidden_form_variables) { + 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, + hidden_variables => $_hidden_variables_ref, + }; + + # Ausgabe des Templates + print($form->parse_html_template('ustva/config_step2', $template_ref)); + + $lxdebug->leave_sub(); } @@ -1549,52 +1343,14 @@ sub create_steuernummer { $lxdebug->leave_sub(); } -sub get_config { - $lxdebug->enter_sub(); - - my ($userpath, $filename) = @_; - my ($key, $value) = ''; - open(FACONF, "$userpath/$form->{login}_$filename") - or #falls Datei nicht vorhanden ist - sub { - open(FANEW, ">$userpath/$form->{login}_$filename") - or $form->error("$userpath/$filename : $!"); - close FANEW; - open(FACONF, "$userpath/$form->{login}_$filename") - or $form->error("$userpath/$form->{username}_$filename : $!"); - }; - while () { - last if /^\[/; - next if /^(#|\s)/; - - # remove comments - s/\s#.*//g; - - # remove any trailing whitespace - s/^\s*(.*?)\s*$/$1/; - ($key, $value) = split /=/, $_, 2; - - #if ($value eq ' '){ - # $form->{$key} = " " ; - #} elsif ($value ne ' '){ - $form->{$key} = "$value"; - - #} - } - close FACONF; - - # Textboxen formatieren: Linebreaks entfernen - # - #$form->{FA_Oeffnungszeiten} =~ s/\\\\n/
/g; - $lxdebug->leave_sub(); -} - 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; + create_steuernummer(); # Textboxen formatieren: Linebreaks entfernen # @@ -1604,11 +1360,12 @@ sub save { $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 + 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 @@ -1616,225 +1373,37 @@ 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; - $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 { - $form->{saved} = $locale->text('Bitte eine Steuernummer angeben'); + $form->{saved} = $locale->text('Choose a Tax Number'); } - &edit_form; - $lxdebug->leave_sub(); -} - -sub show_fa_daten { - $lxdebug->enter_sub(); - my $readonly = $_; - my $oeffnungszeiten = $form->{FA_Oeffnungszeiten}; - $oeffnungszeiten =~ s/\\\\n/\n/g; - print qq|
-
- - | - . $locale->text('Finanzamt') . qq| $form->{FA_Name} - - |; - - #print qq|\n

$form->{FA_Ergaenzung_Name} 

- # | if ( $form->{FA_Ergaenzung_Name} ); - print qq| - - - - - -
-
-
- - | . $locale->text('Address') . qq| - - - - - - - - - - - - - - - -
- | . $locale->text('Finanzamt') . qq| -
- - -
- -
- - - -
-
-
-
- - | . $locale->text('Kontakt') . qq| - - | . $locale->text('Telefon') . qq|
- -
-
- | . $locale->text('Fax') . qq|
- -
-
- | . $locale->text('Internet') . qq|
- -
-
- -
-
- 		-
-
- - | . $locale->text('Öffnungszeiten') . qq| - - -
-
- |; - my $FA_1 = - ( $form->{FA_BLZ_1} ne '' - && $form->{FA_Kontonummer_1} ne '' - && $form->{FA_Bankbezeichnung_1} ne ''); - my $FA_2 = - ( $form->{FA_BLZ_2} ne '' - && $form->{FA_Kontonummer_2} ne '' - && $form->{FA_Bankbezeichnung_oertlich} ne ''); - - if ($FA_1 && $FA_2) { - print qq| -
- - | - . $locale->text('Bankverbindungen des Finanzamts') . qq| - - - - - - -
- | . $locale->text('Kreditinstitut') . qq| -
- -
-
- | . $locale->text('Kontonummer') . qq| -
- -
-
- | . $locale->text('Bankleitzahl') . qq| -
- - 		- | . $locale->text('Kreditinstitut') . qq| -
- -
-
- | . $locale->text('Kontonummer') . qq| -
- -
-
- | . $locale->text('Bankleitzahl') . qq| -
- -
-
- |; - } elsif ($FA_1) { - print qq| -
- - | - . $locale->text('Bankverbindung des Finanzamts') . qq| - - | . $locale->text('Kontonummer') . qq| -
- -
-
- | . $locale->text('Bankleitzahl (BLZ)') . qq| -
- -
-
- | . $locale->text('Kreditinstitut') . qq| -
- -
-
- |; - } else { - print qq| -
- - | - . $locale->text('Bankverbindung des Finanzamts') . qq| - - | . $locale->text('Kontonummer') . qq| -
- -
-
- | . $locale->text('Bankleitzahl (BLZ)') . qq| -
- -
-
- | . $locale->text('Kreditinstitut') . qq| -
- -
- |; - } - print qq| -
-
- |; + config_step2(); $lxdebug->leave_sub(); } @@ -1844,20 +1413,20 @@ sub continue { # allow Symbolic references just here: no strict 'refs'; - &{ $form->{nextsub} }; + call_sub($form->{"nextsub"}); use strict 'refs'; $lxdebug->leave_sub(); } sub back { $lxdebug->enter_sub(); - &{ $form->{lastsub} }; + call_sub($form->{"lastsub"}); $lxdebug->leave_sub(); } sub elster_hash { $lxdebug->enter_sub(); - my $finanzamt = USTVA::query_finanzamt(\%myconfig, \%$form); + my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form); $lxdebug->leave_sub(); return $finanzamt; }