-#!/bin/perl
#=====================================================================
# Lx-Office ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
# German Tax authority Module and later ELSTER Interface
#======================================================================
-require "$form->{path}/arap.pl";
+use strict;
+use utf8;
+
+require "bin/mozilla/common.pl";
#use strict;
#no strict 'refs';
#our ($myconfig);
#use CGI::Carp "fatalsToBrowser";
+use List::Util qw(first);
+
use SL::PE;
use SL::RP;
use SL::USTVA;
# $locale->text('Oct')
# $locale->text('Nov')
# $locale->text('Dec')
+
#############################
sub report {
- $lxdebug->enter_sub();
- my $myconfig = \%myconfig;
- use CGI;
+ $::lxdebug->enter_sub();
+
+ 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
- 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 = '';
+ my $hide = '';
$form->header;
- print qq|
-<body>
-<form method=post action=$form->{script}>
+ # Einlesen der Finanzamtdaten
+ my $ustva = USTVA->new();
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
-<input type=hidden name=title value="$form->{title}">
+ # 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
+ );
-<table width=100%>
- <tr>
- <th class=listtop>$form->{title}</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- $department
-|;
+ map { $form->{$_} = $myconfig{$_} } @a;
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
- # Einlesen der Finanzamtdaten
- &get_config($userspath, 'finanzamt.ini');
+ my $openings = $form->{FA_Oeffnungszeiten};
+ $openings =~ s/\\\\n/<br>/g;
- # 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 $company_given = ($form->{company} ne '')
+ ? qq|<h3>$form->{company}</h3>\n|
+ : qq|<a href="am.pl?action=config">|
+ . $locale->text('No Company Name given') . qq|!</a><br>|;
- map { $form->{$_} = $myconfig->{$_} } @a;
-
- my $oeffnungszeiten = $form->{FA_Oeffnungszeiten};
- $oeffnungszeiten =~ s/\\\\n/<br>/g;
- print qq|
- <tr >
- <td width="50%" align="left" valign="top">
- <fieldset>
- <legend>
- <b>| . $locale->text('Firma') . qq|</b>
- </legend>
- |;
- if ($form->{company} ne '') {
- print qq|<h3>$form->{company}</h3>\n|;
- } else {
- print qq|
- <a href=am.pl?path=$form->{path}&action=config&level=Programm--Preferences&login=$form->{login}&password=$form->{password}>
- | . $locale->text('Kein Firmenname hinterlegt!') . qq|</a><br>
- |;
- }
# 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/<br \/>/;
+ $temp =~ s/\n/<br \/>/;
($form->{co_street}, $form->{co_city}) = split("<br \/>", $temp);
- $form->{co_city} =~ s/\\n//g;
+ $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}<br>
- $form->{co_street1}<br>
- $form->{co_zip} $form->{co_city}|;
- } else {
- print qq|
- <a href=am.pl?path=$form->{path}&action=config&level=Programm--Preferences&login=$form->{login}&password=$form->{password}>
- | . $locale->text('Keine Firmenadresse hinterlegt!') . qq|</a>\n|;
- }
+
+ my $address_given =
+ ($form->{co_street} && ($form->{co_zip} || $form->{co_city}))
+ ? qq|$form->{co_street}<br>|
+ . qq|$form->{co_street1}<br>|
+ . qq|$form->{co_zip} $form->{co_city}|
+ : qq|<a href="am.pl?action=config|
+ . qq|&level=Programm--Preferences">|
+ . $locale->text('No Company Address given')
+ . qq|!</a>\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|
- <br>
- <br>
- | . $locale->text('Tel.: ') . qq|
- $form->{co_tel}
- <br>
- | . $locale->text('Fax.: ') . qq|
- $form->{co_fax}
- <br>
- <br>
- $form->{co_email}
- <br>
- <br>
- | . $locale->text('Steuernummer: ') . qq|
- |;
+ my $taxnumber_given = ($form->{steuernummer} ne '') ? $form->{steuernummer} : qq|<a href="ustva.pl?action=config_step1">Keine Steuernummer hinterlegt!</a><br>|;
- if ($form->{steuernummer} ne '') {
- print qq|$form->{steuernummer}|;
- } else {
- print qq|
- <a href="ustva.pl?path=$form->{path}&action=edit&level=Programm--Finanzamteinstellungen&login=$form->{login}&password=$form->{password}">
- Keine Steuernummer hinterlegt!</a><br>|;
- }
- print qq|
- <br>
- | . $locale->text('ELSTER-Steuernummer: ') . qq|
- $form->{elstersteuernummer}
- <br>
- <br>
-
- </fieldset>
- <br>
- |;
- if ($form->{FA_steuerberater_name} ne '') {
- print qq|
- <fieldset>
- <legend>
- <input checked="checked" title="|
- . $locale->text('Beraterdaten in UStVA übernehmen?')
- . qq|" name="FA_steuerberater" id=steuerberater class=checkbox type=checkbox value="1">
- <b>| . $locale->text('Steuerberater/-in') . qq|</b>
- </legend>
-
- $form->{FA_steuerberater_name}<br>
- $form->{FA_steuerberater_street}<br>
- $form->{FA_steuerberater_city}<br>
- Tel: $form->{FA_steuerberater_tel}<br>
- </fieldset>
- <br>
- |;
- }
- print qq|
- <fieldset>
- <legend>
- <b>| . $locale->text('Voranmeldezeitraum') . qq|</b>
- </legend>
- |;
- &ustva_vorauswahl();
+ my $ustva_vorauswahl = &ustva_vorauswahl();
- my @years = ();
- if (not defined $form->{all_years}) {
+ my @all_years = $form->all_years(\%myconfig);
- # 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|<option>$_\n| }
- @{ $form->{all_years} };
- print qq|
- <select name=year title="| . $locale->text('Year') . qq|">
- |;
- my $key = '';
- foreach $key (@years) {
- print qq|<option |;
- print qq|selected| if ($key eq $form->{year});
- print qq| >$key</option>
- |;
+ my $select_year = qq|<select name=year title="|
+ . $locale->text('Year') . qq|">|;
+ foreach my $key (@all_years) {
+ $select_year .= qq|<option |;
+ $select_year .= qq|selected| if ($key eq $form->{year});
+ $select_year .= qq| >$key</option>|;
}
+ $select_year .= qq|</select>|;
+
+ my $_checked = '';
+ $_checked = "checked" if ($form->{kz10} eq '1');
+ my $checkbox_kz_10 = qq|<input name="FA_10" id=FA_10 class=checkbox|
+ . qq| type=checkbox value="1" $_checked title = "|
+ . $locale->text('Amended Advance Turnover Tax Return (Nr. 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}
+ }
+ ];
- my $voranmeld = $form->{FA_voranmeld};
- print qq| </select>|;
- my $checked = '';
- $checked = "checked" if ($form->{kz10} eq '1');
- print qq|
- <input name="FA_10" id=FA_10 class=checkbox type=checkbox value="1" $checked title = "|
- . $locale->text(
- 'Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererklärung)')
- . qq|">
- | . $locale->text('Berichtigte Anmeldung') . qq|
- <br>
- |;
+ # Which COA is in use?
- if ($voranmeld ne '') {
- print qq|
- <br>
- | . $locale->text($voranmeld) . qq|
- |;
- print qq| mit Dauerfristverlängerung| if ($form->{FA_dauerfrist} eq '1');
- print qq|
+ $ustva->get_coa($form, \%myconfig);
- <br>
- |;
- }
- if ($form->{method} ne '') {
- print qq|| . $locale->text('Method') . qq|: |;
- print qq|| . $locale->text('accrual') . qq||
- if ($form->{method} eq 'accrual');
- print qq|| . $locale->text('cash') . qq|| if ($form->{method} eq 'cash');
- }
- print qq|
- </fieldset>
-
- </td>|;
-
- if ($form->{FA_Name} ne '') {
- print qq|
- <td width="50%" valign="top">
- <fieldset>
- <legend>
- <b>| . $locale->text('Finanzamt') . qq|</b>
- </legend>
- <h3>$form->{FA_Name}</h2>
- |;
-
- #if ($form->{FA_Ergaenzung_Name ne ''}){
- # print qq|
- # $form->{FA_Ergaenzung_Name} 
- # <br>
- # |;
- #}
- print qq|
- $form->{FA_Strasse}
- <br>
- $form->{FA_PLZ} $form->{FA_Ort}
- <br>
- <br>
- | . $locale->text('Tel. : ') . qq|
- $form->{FA_Telefon}
- <br>
- | . $locale->text('Fax. : ') . qq|
- $form->{FA_Fax}
- <br>
- <br>
- <a href="mailto:$form->{FA_Email}?subject=|
- . CGI::escape("Steuer Nr: $form->{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}
- </a>
- <br>
- <a href="$form->{FA_Internet}">
- $form->{FA_Internet}
- </a>
- <br>
- <br>
- | . $locale->text('Öffnungszeiten') . qq|
- <br>
- $oeffnungszeiten
- <br>
- |;
+ 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,
- 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|
- <br>
- | . $locale->text('Bankverbindungen') . qq|
- <table>
- <tr>
- <td>
- $form->{FA_Bankbezeichnung_1}
- <br>
- | . $locale->text('Konto: ') . qq|
- $form->{FA_Kontonummer_1}
- <br>
- | . $locale->text('BLZ: ') . qq|
- $form->{FA_BLZ_1}
- </td>
- <td>
- $form->{FA_Bankbezeichnung_oertlich}
- <br>
- | . $locale->text('Konto: ') . qq|
- $form->{FA_Kontonummer_2}
- <br>
- | . $locale->text('BLZ: ') . qq|
- $form->{FA_BLZ_2}
- </td>
- </tr>
- </table>
- <br>|;
- } elsif ($FA_1) {
- print qq|
- <br>
- | . $locale->text('Bankverbindung') . qq|
- <br>
- <br>
- $form->{FA_Bankbezeichnung_1}
- <br>
- | . $locale->text('Konto: ') . qq|
- $form->{FA_Kontonummer_1}
- <br>
- | . $locale->text('BLZ: ') . qq|
- $form->{FA_BLZ_1} <br>
- <br>|;
- } elsif ($FA_2) {
- print qq|
- <br>
- | . $locale->text('Bankverbindung') . qq|
- <br>
- <br>
- $form->{FA_Bankbezeichnung_oertlich}
- <br>
- | . $locale->text('Konto: ') . qq|
- $form->{FA_Kontonummer_2}
- <br>
- | . $locale->text('BLZ: ') . qq|
- $form->{FA_BLZ_2}
- |;
- }
- print qq|
-
- </fieldset>
- <br>
- <fieldset>
- <legend>
- <b>| . $locale->text('Ausgabeformat') . qq|</b>
- </legend>
- |;
+ };
- &show_options;
- my $ausgabe = '1';
- print qq|
- </fieldset>
- |;
+ print($form->parse_html_template('ustva/report', $template_ref));
- } else {
- print qq|
- <td width="50%" valign="bottom">
- <fieldset>
- <legend>
- <b>| . $locale->text('Hinweise') . qq|</b>
- </legend>
- <h2 class="confirm">|
- . $locale->text('Missing Preferences: Outputroutine disabled')
- . qq|</h2>
- <h3>| . $locale->text('Help:') . qq|</h3>
- <ul>
- <li>| . $locale->text('Hint-Missing-Preferences') . qq|</li>
- </ul>
- </fieldset>
- |;
- my $ausgabe = '';
- $hide = q|disabled="disabled"|;
- }
- print qq|
- </td>
- </tr>
- |;
- #}# end if report = ustva
-
- print qq|
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size="3" noshade></td>
- </tr>
- </table>
-
- <br>
- <input type="hidden" name="address" value="$form->{address}">
- <input type="hidden" name="reporttype" value="custom">
- <input type="hidden" name="co_street" value="$form->{co_street}">
- <input type="hidden" name="co_city" value="$form->{co_city}">
- <input type="hidden" name="path" value="$form->{path}">
- <input type="hidden" name="login" value="$form->{login}">
- <input type="hidden" name="password" value="$form->{password}">
- <table width="100%">
- <tr>
- <td align="left">
- <input type=hidden name=nextsub value=generate_ustva>
- <input $hide type=submit class=submit name=action value="|
- . $locale->text('Show') . qq|">
- </td>
- <td align="right">
-
- <!--</form>
- <form action="doc/ustva.html" method="get">
- -->
- <input type=submit class=submit name=action value="|
- . $locale->text('Help') . qq|">
- <!-- </form>-->
- </td>
- </tr>
- </table>
- |;
-
- print qq|
-
- </body>
- </html>
- |;
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
-#############################
+
sub help {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
# parse help documents under doc
- my $tmp = $form->{templates};
- $form->{templates} = 'doc';
- $form->{help} = 'ustva';
- $form->{type} = 'help';
- $form->{format} = 'html';
- &generate_ustva();
+ my $tmp = $::form->{templates};
+ $::form->{templates} = 'doc';
+ $::form->{help} = 'ustva';
+ $::form->{type} = 'help';
+ $::form->{format} = 'html';
+ generate_ustva();
#$form->{templates} = $tmp;
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub show {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
#&generate_ustva();
- no strict 'refs';
- $lxdebug->leave_sub();
- &{ $form->{nextsub} };
- use strict 'refs';
+ $::lxdebug->leave_sub();
+ call_sub($::form->{"nextsub"});
}
sub ustva_vorauswahl {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
+
+ $::auth->assert('advance_turnover_tax_return');
+
+ my $select_vorauswahl;
#Aktuelles Datum zerlegen:
my $date = $form->datetonum($form->current_date(\%myconfig), \%myconfig);
$form->{day} = substr($date, 6, 2);
$form->{month} = substr($date, 4, 2);
$form->{year} = substr($date, 0, 4);
- $lxdebug->message(LXDebug::DEBUG1, qq|
- Actual date from Database: $date\n
+ $::lxdebug->message(LXDebug->DEBUG1, qq|
+ Actual date from Database: $date\n
Actual year from Database: $form->{year}\n
Actual day from Database: $form->{day}\n
Actual month from Database: $form->{month}\n|);
#$form->{day}= '11';
#$form->{month}= '01';
#$form->{year}= 2004;
- print qq|
+ $select_vorauswahl = qq|
<input type=hidden name=day value=$form->{day}>
<input type=hidden name=month value=$form->{month}>
<input type=hidden name=yymmdd value=$yymmdd>
<input type=hidden name=sel value=$sel>
- |;
+ |;
if ($form->{FA_voranmeld} eq 'month') {
$sel = '';
my $dfv = '';
- # Offset für Dauerfristverlängerung
+ # Offset für Dauerfristverlängerung
$dfv = '100' if ($form->{FA_dauerfrist} eq '1');
SWITCH: {
};
}
- print qq|<select id="zeitraum" name="period" title="|
+ $select_vorauswahl .= qq|<select id="zeitraum" name="period" title="|
. $locale->text('Select a period') . qq|" >|;
my $key = '';
foreach $key (sort keys %liste) {
my $selected = '';
$selected = 'selected' if ($sel eq $key);
- print qq|
+ $select_vorauswahl .= qq|
<option value="$key" $selected> $liste{$key}</option>
- |;
+ |;
}
- print qq|</select>|;
+ $select_vorauswahl .= qq|</select>|;
} elsif ($form->{FA_voranmeld} eq 'quarter') {
my $yy = $form->{year} * 10000;
$yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
$sel = '';
- my $dfv = ''; # Offset für Dauerfristverlängerung
+ my $dfv = ''; # Offset für Dauerfristverlängerung
$dfv = '100' if ($form->{FA_dauerfrist} eq '1');
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 id="zeitraum" name="period" title="|
+ $select_vorauswahl .= qq|<select id="zeitraum" name="period" title="|
. $locale->text('Select a period') . qq|" >|;
my $key = '';
foreach $key (sort keys %liste) {
my $selected = '';
$selected = 'selected' if ($sel eq $key);
- print qq|
+ $select_vorauswahl .= qq|
<option value="$key" $selected>$liste{$key}</option>
|;
}
- print qq|\n</select>
+ $select_vorauswahl .= qq|\n</select>
|;
} else {
# keine Vorauswahl bei Voranmeldungszeitraum
- print qq|<select id="zeitraum" name="period" title="|
+ $select_vorauswahl .= qq|<select id="zeitraum" name="period" title="|
. $locale->text('Select a period') . qq|" >|;
my %listea = ('41' => '1. Quarter',
'13' => 'Yearly',);
my $key = '';
foreach $key (sort keys %listea) {
- print qq|
+ $select_vorauswahl .= qq|
<option value="$key">|
. $locale->text("$listea{$key}")
. qq|</option>\n|;
}
foreach $key (sort keys %listeb) {
- print qq|
+ $select_vorauswahl .= qq|
<option value="$key">|
. $locale->text("$listeb{$key}")
. qq|</option>\n|;
}
- print qq|</select>|;
+ $select_vorauswahl .= qq|</select>|;
}
- $lxdebug->leave_sub();
-}
+ $::lxdebug->leave_sub();
-sub config {
- $lxdebug->enter_sub();
- edit();
- $lxdebug->leave_sub();
+ return $select_vorauswahl;
}
+#sub config {
+# $::lxdebug->enter_sub();
+# config_step1();
+# $::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";
my $media = qq| <input type=hidden name="media" value="screen">|;
my $format =
qq| <option value=html selected>|
- . $locale->text('Vorschau')
+ . $::locale->text('Preview')
. qq|</option>|;
- if ($latex_templates) {
+ if ($::lx_office_conf{print_templates}{latex}) {
$format .=
qq| <option value=pdf>|
- . $locale->text('UStVA als PDF-Dokument')
+ . $::locale->text('UStVA (PDF-Dokument)')
. qq|</option>|;
}
#my $disabled= qq|disabled="disabled"|;
#$disabled='' if ($form->{elster} eq '1' );
- if ($form->{elster} eq '1') {
+ if ($::form->{elster} eq '1') {
$format .=
qq|<option value=elsterwinston>|
- . $locale->text('ELSTER Export nach Winston')
+ . $::locale->text('ELSTER Export (Winston)')
. qq|</option>|
. qq|<option value=elstertaxbird>|
- . $locale->text('ELSTER Export nach Taxbird')
- . qq|</option>|;
+ . $::locale->text('ELSTER Export (Taxbird)')
+ . qq|</option>|;
}
#$format .= qq|<option value=elster>|.$locale->text('ELSTER Export nach Winston').qq|</option>|;
- print qq|
+ my $show_options = qq|
$type
$media
<select name=format title = "|
- . $locale->text('Ausgabeformat auswählen...') . qq|">$format</select>
+ . $::locale->text('Choose Outputformat') . qq|">$format</select>
|;
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
+
+ return $show_options;
}
sub generate_ustva {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- # Aufruf von get_config aus bin/mozilla/ustva.pl zum
- # Einlesen der Finanzamtdaten aus finanzamt.ini
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- get_config($userspath, 'finanzamt.ini');
+ $::auth->assert('advance_turnover_tax_return');
- # form vars initialisieren
+ # 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' '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} = "";
}
$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";
};
}
- # using dates in ISO-8601 format: yyyymmmdd for Postgres...
- USTVA->ustva(\%myconfig, \%$form);
+ # Kontrollvariablen für die Templates
+ $form->{"year$_"} = ($form->{year} >= $_ ) ? "1":"0" for 2007..2107;
+
+ # 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} =
# 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<br>\n$shorttodate";
$form->{longperiod} =
$locale->text('for Period')
. qq|<br>\n$longfromdate |
- . $locale->text('bis')
+ . $locale->text('to (date)')
. qq| $longtodate|;
}
$form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
$form->{longperiod} .=
"<br>\n$longcomparefromdate "
- . $locale->text('bis')
+ . $locale->text('to (date)')
. qq| $longcomparetodate|;
}
$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
$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);
- $form->{IN} = "$form->{type}-$form->{year}.tex";
+ my @category_euro = $ustva->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '0',
+ });
- $form->{padding} = "~~";
- $form->{bold} = "\textbf{";
- $form->{endbold} = "}";
- $form->{br} = '\\\\';
+ $form->{id} = [];
+ $form->{amount} = [];
- 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);
+ if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') {
- my $number = '';
+ $form->{IN} = "$form->{type}-$form->{year}.tex";
+ $form->{padding} = "~~";
+ $form->{bold} = "\textbf{";
+ $form->{endbold} = "}";
+ $form->{br} = '\\\\';
- # 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;
+ # Zahlenformatierung für Latex USTVA Formulare
+
+ 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<br \> Not yet implemented!'
- )
- );
- }
-
- } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
- $form->{IN} = $form->{type} . '.html';
- $form->{padding} = " ";
- $form->{bold} = "<b>";
- $form->{endbold} = "</b>";
- $form->{br} = "<br>";
- $form->{address} =~ s/\\n/<br \/>/g;
+ } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
- } elsif ($form->{format} =~ /^elster/) {
+ $form->{IN} = $form->{type} . '.html';
+ $form->{padding} = " ";
+ $form->{bold} = "<b>";
+ $form->{endbold} = "</b>";
+ $form->{br} = "<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.<br \> Not yet implemented!'
- ));
- }
+ foreach my $number (@category_cent) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
+ }
- if ( $form->{format} eq 'elsterwinston' ) {
+ 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
+
+ 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', '') : '';
+ }
- if ( $form->{format} eq 'elstertaxbird' ) {
+ 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} = "$::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");
+ #my $iconv = $self->{"iconv"};
+ #$iconv->convert($variable);
if ($form->{period} =~ /^[4]\d$/ ){
my %periods = ( # Lx => taxbird
'41' => '12',
'43' => '14',
'44' => '15',
);
-
+
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;
my $period = $form->{period};
- $period * 1;
+ $period *= 1;
$period--;
- $form->{period} = $period;
- } else {
- $form->header;
- USTVA::error( $locale->text('Wrong Period' ));
- exit(0);
-
- }
-
+ $form->{taxbird_period} = $period;
+ } else {
+ $form->header;
+ USTVA::error( $locale->text('Wrong Period' ));
+ ::end_of_request();
+ }
+
+ # 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;
+ }
+
+ 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
+
+ # 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' ) . "!");
+ ::end_of_request();
+
+ } else { # All other Formats are wrong
+ $form->header;
+ USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
+ ::end_of_request();
}
- # 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->{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();
+
+ 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 edit {
- $lxdebug->enter_sub();
+sub config_step1 {
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
+
+$::form->{title} = $::locale->text('Tax Office Preferences');
# edit all taxauthority prefs
- $form->header;
- &get_config($userspath, 'finanzamt.ini');
-
- #&create_steuernummer;
-
- 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|
- <body>
- <form name="verzeichnis" method=post action="$form->{script}">
- <table width=100%>
- <tr>
- <th class="listtop">|
- . $locale->text('Finanzamt - Einstellungen') . qq|</th>
- </tr>
- <tr>
- <td>
- <br>
- <fieldset>
- <legend><b>|
- . $locale->text('Angaben zum Finanzamt') . qq|</b></legend>
- |;
+ $::form->header;
- #print qq|$form->{terminal}|;
+ my $ustva = USTVA->new();
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
+
+ my $land = $::form->{elsterland};
+ my $amt = $::form->{elsterFFFF};
- USTVA::fa_auswahl($land, $amt, &elster_hash());
- print qq|
- </fieldset>
- <br>
- |;
- my $checked = '';
- $checked = "checked" if ($form->{method} eq 'accrual');
- print qq|
- <fieldset>
- <legend><b>| . $locale->text('Verfahren') . qq|</b>
- </legend>
- <input name=method id=accrual class=radio type=radio value="accrual" $checked>
- <label for="accrual">| . $locale->text('accrual') . qq|</label>
- <br>
- |;
- $checked = '';
- $checked = "checked" if ($form->{method} eq 'cash');
- print qq|
- <input name=method id=cash class=radio type=radio value="cash" $checked>
- <label for="cash">| . $locale->text('cash') . qq|</label>
- </fieldset>
- <br>
- <fieldset>
- <legend><b>| . $locale->text('Voranmeldungszeitraum') . qq|</b>
- </legend>
- |;
- $checked = '';
- $checked = "checked" if ($form->{FA_voranmeld} eq 'month');
- print qq|
- <input name=FA_voranmeld id=month class=radio type=radio value="month" $checked>
- <label for="month">| . $locale->text('month') . qq|</label>
- <br>
- |;
- $checked = '';
- $checked = "checked" if ($form->{FA_voranmeld} eq 'quarter');
- print qq|
- <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter" $checked>
- <label for="quarter">| . $locale->text('quarter') . qq|</label>
- <br>
- |;
- $checked = '';
- $checked = "checked" if ($form->{FA_dauerfrist} eq '1');
- print qq|
- <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1" $checked>
- <label for="">|
- . $locale->text('Dauerfristverlängerung') . qq|</label>
-
- </fieldset>
- <br>
- <fieldset>
- <legend><b>| . $locale->text('Steuerberater/-in') . qq|</b>
- </legend>
- |;
- $checked = '';
- $checked = "checked" if ($form->{FA_71} eq 'X');
- print qq|
- <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X" $checked>
- <label for="FA_71">|
- . $locale->text('Verrechnung des Erstattungsbetrages erwünscht (Zeile 71)')
- . qq|</label>
- <br>
- <br>-->
- <table>
- <tr>
- <td>
- | . $locale->text('Name') . qq|
- </td>
- <td>
- | . $locale->text('Straße') . qq|
- </td>
- <td>
- | . $locale->text('PLZ, Ort') . qq|
- </td>
- <td>
- | . $locale->text('Telefon') . qq|
- </td>
- </tr>
- <tr>
- <td>
- <input name="FA_steuerberater_name" id=steuerberater size=25 value="$form->{FA_steuerberater_name}">
- </td>
- <td>
- <input name="FA_steuerberater_street" id=steuerberater size=25 value="$form->{FA_steuerberater_street}">
- </td>
- <td>
- <input name="FA_steuerberater_city" id=steuerberater size=25 value="$form->{FA_steuerberater_city}">
- </td>
- <td>
- <input name="FA_steuerberater_tel" id=steuerberater size=25 value="$form->{FA_steuerberater_tel}">
- </tr>
- </table>
-
- </fieldset>
-
- <br>
- <br>
- <hr>
- <!--<input type=submit class=submit name=action value="|
- . $locale->text('debug') . qq|">-->
- |;
- print qq|
- <input type="button" name="Verweis" value="|
- . $locale->text('Back to user config...') . qq|"
- onClick="self.location.href='$callback'">| if ($callback ne '');
- print qq|
-
- <input type=submit class=submit name=action value="|
- . $locale->text('continue') . qq|">
-
- </td>
- </tr>
- </table>
- |;
- my @variables = qw( steuernummer elsterland elstersteuernummer elsterFFFF);
- my $variable = '';
- foreach $variable (@variables) {
- print qq|
- <input name=$variable type=hidden value="$form->{$variable}">|;
+ $::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 $_hidden_variables_ref;
+
+ 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 },
+ { '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
+ );
+
+ 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 = '';
- #<input type=hidden name="steuernummer_new" value="$form->{$steuernummer_new}">
- print qq|
- <input type=hidden name="callback" value="$callback">
- <input type=hidden name="nextsub" value="edit_form">
- <input type=hidden name="warnung" value="1">
- <input type=hidden name="saved" value="|
- . $locale->text('Bitte Angaben überprüfen') . qq|">
- <input type=hidden name="path" value=$form->{path}>
- <input type=hidden name="login" value=$form->{login}>
- <input type=hidden name="password" value=$form->{password}>
- <input type=hidden name="warnung" value="0">
- |;
+ # 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,
- @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);
+ };
- foreach $variable (@variables) {
- print qq|
- <input name=$variable type=hidden value="$form->{$variable}">|;
- }
+ # Ausgabe des Templates
+ print($::form->parse_html_template('ustva/config_step1', $template_ref));
- print qq|
- </form>
- </body>
-|;
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
-sub edit_form {
- $lxdebug->enter_sub();
+sub config_step2 {
+ $::lxdebug->enter_sub();
+
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
+
+ $::auth->assert('advance_turnover_tax_return');
+
$form->header();
- print qq|
- <body>
- |;
+
+# print qq|
+# <body>
+# |;
+
my $elsterland = '';
my $elster_amt = '';
my $elsterFFFF = '';
my $elstersteuernummer = '';
- &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'
. $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 = ();
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;
+
+ create_steuernummer();
# rebuild elster_amt
my $amt = '';
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|
- <form name="elsterform" method=post action="$form->{script}">
- <table width="100%">
- <tr>
- <th colspan="2" class="listtop">|
- . $locale->text('Finanzamt - Einstellungen') . qq|</th>
- </tr>
- <tr>
- <td colspan=2>
- <br>
- |;
- &show_fa_daten;
- print qq|
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <br>
- <fieldset>
- <legend>
- <font size="+1">| . $locale->text('Steuernummer') . qq|</font>
- </legend>
- <br>
- |;
- $steuernummer =
- USTVA::steuernummer_input($form->{elsterland}, $form->{elsterFFFF},
- $form->{steuernummer});
- print qq|
- </H2><br>
- </fieldset>
- <br>
- <br>
- <hr>
- </td>
- </tr>
- <tr>
- <td align="left">
-
- <input type=hidden name=lastsub value="edit">
- |;
- print qq|<input type=submit class=submit name=action value="|
- . $locale->text('back') . qq|">|
- if ($form->{callback} eq '');
-
- print qq|
- <input type="button" name="Verweis" value="|
- . $locale->text('Back to user config...') . qq|"
- onClick="self.location.href='$form->{callback}'">|
- if ($form->{callback} ne '');
-
- if ($form->{warnung} eq "1") {
- print qq|
- <input type=hidden name=nextsub value="edit_form">
- <input type=submit class=submit name=action value="|
- . $locale->text('continue') . qq|">
- <input type=hidden name="saved" value="|
- . $locale->text('Bitte alle Angaben überprüfen') . qq|">
- |;
- } else {
- print qq|
- <input type=hidden name="nextsub" value="save">
- <input type=hidden name="filename" value="finanzamt.ini">
- <input type=submit class=submit name=action value="|
- . $locale->text('save') . qq|">
- |;
- }
+ my $steuernummer = $stnr eq '' ? $form->{steuernummer} : '';
+
+ $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
- print qq|
- </td>
- <td align="right">
- <H2 class=confirm>$form->{saved}</H2>
- </td>
- </tr>
- </table>
- |;
- 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
+ $ustva->get_coa($form, \%myconfig);
+
+ my $input_steuernummer = $ustva->steuernummer_input(
+ $form->{elsterland},
+ $form->{elsterFFFF},
+ $form->{steuernummer}
);
- my $variable = '';
- foreach $variable (@variables) {
- print qq|
- <input name="$variable" type="hidden" value="$form->{$variable}">|;
+
+ $::lxdebug->message(LXDebug->DEBUG1, qq|$input_steuernummer|);
+
+
+ my $_hidden_variables_ref;
+
+ my %_hidden_local_variables = (
+ 'elsterland' => $elsterland,
+ 'elsterFFFF' => $elsterFFFF,
+ 'warnung' => 0,
+ 'elstersteuernummer' => $elstersteuernummer,
+ 'steuernummer' => $stnr,
+ 'lastsub' => 'config_step1',
+ 'nextsub' => 'save',
+
+ );
+
+ foreach my $variable (keys %_hidden_local_variables) {
+ push @{ $_hidden_variables_ref },
+ { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
}
- print qq|
- <input type=hidden name="elsterland" value="$elsterland">
- <input type=hidden name="elsterFFFF" value="$elsterFFFF">
- <input type=hidden name="warnung" value="$warnung">
- <input type=hidden name="elstersteuernummer" value="$elstersteuernummer">
- <input type=hidden name="steuernummer" value="$stnr">
- <input type=hidden name="callback" value="$form->{callback}">
- </form>
- |;
- $lxdebug->leave_sub();
+
+ 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
+ );
+
+ foreach my $variable (@_hidden_form_variables) {
+ push @{ $_hidden_variables_ref},
+ { 'variable' => $variable, 'value' => $form->{$variable} };
+ }
+
+ my $template_ref = {
+ input_steuernummer => $input_steuernummer,
+ readonly => '', #q|disabled="disabled"|,
+ callback => $form->{callback},
+ hidden_variables => $_hidden_variables_ref,
+ };
+
+ # Ausgabe des Templates
+ print($form->parse_html_template('ustva/config_step2', $template_ref));
+
+
+ $::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}
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 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 (<FACONF>) {
- 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;
+sub save {
+ $::lxdebug->enter_sub();
- # Textboxen formatieren: Linebreaks entfernen
- #
- #$form->{FA_Oeffnungszeiten} =~ s/\\\\n/<br>/g;
- $lxdebug->leave_sub();
-}
+ $::auth->assert('advance_turnover_tax_return');
-sub save {
- $lxdebug->enter_sub();
- my $filename = "$form->{login}_$form->{filename}";
+ 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
#
- $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
+ $::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->{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;
-
+ $::form->{$key} =~ s/\\/\\\\/g;
# strip M
- $form->{$key} =~ s/\r\n/\n/g;
- print CONF qq|$key=|;
- if ($form->{$key} ne 'Y') {
- print CONF qq|$form->{$key}\n|;
+ $::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 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('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| <br>
- <fieldset>
- <legend>
- <font size="+1">|
- . $locale->text('Finanzamt') . qq| $form->{FA_Name}</font>
- </legend>
- |;
-
- #print qq|\n<h4>$form->{FA_Ergaenzung_Name} </h4>
- # | if ( $form->{FA_Ergaenzung_Name} );
- print qq|
- <table width="100%" valign="top">
- <tr>
- <td valign="top">
- <br>
- <fieldset>
- <legend>
- <b>| . $locale->text('Address') . qq|</b>
- </legend>
-
- <table width="100%">
- <tr>
- <td>
- | . $locale->text('Finanzamt') . qq|
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input name="FA_Name" size="40" title="FA_Name" value="$form->{FA_Name}" $readonly>
- <td>
- </tr>
- <tr>
- <td colspan="2">
- <input name="FA_Strasse" size="40" title="FA_Strasse" value="$form->{FA_Strasse}" $readonly>
- </td width="100%">
- </tr>
- <tr>
- <td width="116px">
- <input name="FA_PLZ" size="10" title="FA_PLZ" value="$form->{FA_PLZ}" $readonly>
- </td>
- <td>
- <input name="FA_Ort" size="20" title="FA_Ort" value="$form->{FA_Ort}" $readonly>
- </td>
- </tr>
- </table>
- </fieldset>
- <br>
- <fieldset>
- <legend>
- <b>| . $locale->text('Kontakt') . qq|</b>
- </legend>
- | . $locale->text('Telefon') . qq|<br>
- <input name="FA_Telefon" size="40" title="FA_Telefon" value="$form->{FA_Telefon}" $readonly>
- <br>
- <br>
- | . $locale->text('Fax') . qq|<br>
- <input name="FA_Fax" size="40" title="FA_Fax" value="$form->{FA_Fax}" $readonly>
- <br>
- <br>
- | . $locale->text('Internet') . qq|<br>
- <input name="FA_Email" size="40" title="FA_Email" value="$form->{FA_Email}" $readonly>
- <br>
- <br>
- <input name="FA_Internet" size="40" title="" title="FA_Internet" value="$form->{FA_Internet}" $readonly>
- <br>
- </fieldset>
- </td>
- <td valign="top">
- <br>
- <fieldset>
- <legend>
- <b>| . $locale->text('Öffnungszeiten') . qq|</b>
- </legend>
- <textarea name="FA_Oeffnungszeiten" rows="4" cols="40" $readonly>$oeffnungszeiten</textarea>
- </fieldset>
- <br>
- |;
- 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|
- <fieldset>
- <legend>
- <b>|
- . $locale->text('Bankverbindungen des Finanzamts') . qq|</b>
- <legend>
- <table>
- <tr>
- <td>
- | . $locale->text('Kreditinstitut') . qq|
- <br>
- <input name="FA_Bankbezeichnung_1" size="30" value="$form->{FA_Bankbezeichnung_1}" $readonly>
- <br>
- <br>
- | . $locale->text('Kontonummer') . qq|
- <br>
- <input name="FA_Kontonummer_1" size="15" value="$form->{FA_Kontonummer_1}" $readonly>
- <br>
- <br>
- | . $locale->text('Bankleitzahl') . qq|
- <br>
- <input name="FA_BLZ_1" size="15" value="$form->{FA_BLZ_1}" $readonly>
- </td>
- <td>
- | . $locale->text('Kreditinstitut') . qq|
- <br>
- <input name="FA_Bankbezeichnung_oertlich" size="30" value="$form->{FA_Bankbezeichnung_oertlich}" $readonly>
- <br>
- <br>
- | . $locale->text('Kontonummer') . qq|
- <br>
- <input name="FA_Kontonummer_2" size="15" value="$form->{FA_Kontonummer_2}" $readonly>
- <br>
- <br>
- | . $locale->text('Bankleitzahl') . qq|
- <br>
- <input name="FA_BLZ_2" size="15" value="$form->{FA_BLZ_2}" $readonly>
- </td>
- </tr>
- </table>
- </fieldset>
- |;
- } elsif ($FA_1) {
- print qq|
- <fieldset>
- <legend>
- <b>|
- . $locale->text('Bankverbindung des Finanzamts') . qq|</b>
- <legend>
- | . $locale->text('Kontonummer') . qq|
- <br>
- <input name="FA_Kontonummer_1" size="30" value="$form->{FA_Kontonummer_1}" $readonly>
- <br>
- <br>
- | . $locale->text('Bankleitzahl (BLZ)') . qq|
- <br>
- <input name="FA_BLZ_1" size="15" value="$form->{FA_BLZ_1}" $readonly>
- <br>
- <br>
- | . $locale->text('Kreditinstitut') . qq|
- <br>
- <input name="FA_Bankbezeichnung_1" size="15" value="$form->{FA_Bankbezeichnung_1}" $readonly>
- <br>
- </fieldset>
- |;
- } else {
- print qq|
- <fieldset>
- <legend>
- <b>|
- . $locale->text('Bankverbindung des Finanzamts') . qq|</b>
- <legend>
- | . $locale->text('Kontonummer') . qq|
- <br>
- <input name="FA_Kontonummer_2" size="30" value="$form->{FA_Kontonummer_2}" $readonly>
- <br>
- <br>
- | . $locale->text('Bankleitzahl (BLZ)') . qq|
- <br>
- <input name="FA_BLZ_2" size="15" value="$form->{FA_BLZ_2}" $readonly>
- <br>
- <br>
- | . $locale->text('Kreditinstitut') . qq|
- <br>
- <input name="FA_Bankbezeichnung_oertlich" size="15" value="$form->{FA_Bankbezeichnung_oertlich}" $readonly>
- </fieldset>
- |;
- }
- print qq|
- </td>
- </tr>
- </table>
- </fieldset>
- |;
- $lxdebug->leave_sub();
+ config_step2();
+ $::lxdebug->leave_sub();
}
sub continue {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
# allow Symbolic references just here:
- no strict 'refs';
- &{ $form->{nextsub} };
- use strict 'refs';
- $lxdebug->leave_sub();
+ call_sub($::form->{"nextsub"});
+ $::lxdebug->leave_sub();
}
sub back {
- $lxdebug->enter_sub();
- &{ $form->{lastsub} };
- $lxdebug->leave_sub();
+ $::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;
-}
-
-