require "$form->{path}/arap.pl";
-
-#use strict;
+#use strict;
#no strict 'refs';
#use diagnostics;
#use warnings FATAL=> 'all';
my $myconfig = \%myconfig;
use CGI;
$form->{title} = $locale->text('UStVA');
- $form->{kz10}='' ; #Berichtigte Anmeldung? Ja =1
-# $accrual = ($eur) ? "" : "checked";
-# $cash = ($eur) ? "checked" : "";
+ $form->{kz10} = ''; #Berichtigte Anmeldung? Ja =1
+
+ # $accrual = ($eur) ? "" : "checked";
+ # $cash = ($eur) ? "checked" : "";
my $year = '';
my $null = '';
- ($null,$null,$null,$null,$null,$year,$null,$null,$null) = localtime();
+ ($null, $null, $null, $null, $null, $year, $null, $null, $null) =
+ localtime();
$year += 1900;
-
+
my $department = '';
- local $hide ='';
+ local $hide = '';
$form->header;
-
+
print qq|
<body>
<table>
$department
|;
- # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
+
+ # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
# Einlesen der Finanzamtdaten
&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
- company_street company_city company_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/<br>/g;
+
+ 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>
+ <b>| . $locale->text('Firma') . qq|</b>
</legend>
|;
- if ( $form->{company} ne '' ){
+ if ($form->{company} ne '') {
print qq|<h3>$form->{company}</h3>\n|;
- } else
- {
+ } 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>
+ | . $locale->text('Kein Firmenname hinterlegt!') . qq|</a><br>
|;
}
- #klären, ob $form->{company_street|_address} gesetzt sind
- ###
- if ( $form->{address} ne '' ) {
- my $temp = $form->{address};
- $temp =~ s/\\n/<br \/>/;
- print qq|$temp|;
- ($form->{company_street}, $form->{company_city}) = split("<br \/", $temp);
- } elsif ($form->{address} eq '' and ($form->{company_street} ne '' and $form->{company_city} ne '' ) ) {
- print qq|$form->{company_street}<br>\n| if ($form->{company_street} ne '');
- print qq|$form->{company_city}\n| if ($form->{company_city} ne '');
- } elsif ($form->{company_street} eq '' or $form->{company_city} eq '') {
- print 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/<br \/>/;
+ ($form->{co_street}, $form->{co_city}) = split("<br \/>", $temp);
+ }
+
+ 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|;
- }
+ | . $locale->text('Keine Firmenadresse hinterlegt!') . 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->{tel}
+ | . $locale->text('Tel.: ') . qq|
+ $form->{co_tel}
<br>
- |.$locale->text('Fax.: ').qq|
- $form->{fax}
+ | . $locale->text('Fax.: ') . qq|
+ $form->{co_fax}
<br>
<br>
- $form->{email}
+ $form->{co_email}
<br>
<br>
- |.$locale->text('Steuernummer: ').qq|
+ | . $locale->text('Steuernummer: ') . qq|
|;
-
- if ($form->{steuernummer} ne ''){
+
+ if ($form->{steuernummer} ne '') {
print qq|$form->{steuernummer}|;
} else {
print qq|
}
print qq|
<!--<br>
- |.$locale->text('ELSTER-Steuernummer: ').qq|
+ | . $locale->text('ELSTER-Steuernummer: ') . qq|
$form->{elstersteuernummer}
<br>-->
<br>
</fieldset>
<br>
|;
- if ($form->{FA_steuerberater_name} ne ''){
+ 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>
+ <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>
print qq|
<fieldset>
<legend>
- <b>|.$locale->text('Voranmeldezeitraum').qq|</b>
+ <b>| . $locale->text('Voranmeldezeitraum') . qq|</b>
</legend>
|;
&ustva_vorauswahl();
-
- my @years = ();
- if ( not defined $form->{all_years} ) {
+
+ my @years = ();
+ if (not defined $form->{all_years}) {
+
# accounting years if SQL-Ledger Version < 2.4.1
-# $year = $form->{year} * 1;
- @years = sort {$b <=> $a} (2000..($year));
+ # $year = $form->{year} * 1;
+ @years = sort { $b <=> $a } (2000 .. ($year+1));
$form->{all_years} = \@years;
}
- map { $form->{selectaccountingyear} .= qq|<option>$_\n| } @{ $form->{all_years} };
+ map { $form->{selectaccountingyear} .= qq|<option>$_\n| }
+ @{ $form->{all_years} };
print qq|
- <select name=year title="|.$locale->text('Year').qq|">
+ <select name=year title="| . $locale->text('Year') . qq|">
|;
my $key = '';
- foreach $key ( @years ){
+ foreach $key (@years) {
print qq|<option |;
print qq|selected| if ($key eq $form->{year});
print qq| >$key</option>
|;
}
-
-
+
my $voranmeld = $form->{FA_voranmeld};
print qq| </select>|;
my $checked = '';
- $checked = "checked" if ( $form->{kz10} eq '1' );
+ $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|
+ <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>
|;
- if ($voranmeld ne ''){
- print qq|
+
+ if ($voranmeld ne '') {
+ print qq|
<br>
- |.$locale->text($voranmeld).qq|
+ | . $locale->text($voranmeld) . qq|
|;
- print qq| mit Dauerfristverlängerung| if ( $form->{FA_dauerfrist} eq '1');
- print qq|
+ print qq| mit Dauerfristverlängerung| if ($form->{FA_dauerfrist} eq '1');
+ print qq|
<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');
+ 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 ''){
+
+ if ($form->{FA_Name} ne '') {
print qq|
<td width="50%" valign="top">
<fieldset>
<legend>
- <b>|.$locale->text('Finanzamt').qq|</b>
+ <b>| . $locale->text('Finanzamt') . qq|</b>
</legend>
<h3>$form->{FA_Name}</h2>
|;
-
+
#if ($form->{FA_Ergaenzung_Name ne ''}){
# print qq|
# $form->{FA_Ergaenzung_Name} 
$form->{FA_PLZ} $form->{FA_Ort}
<br>
<br>
- |.$locale->text('Tel. : ').qq|
+ | . $locale->text('Tel. : ') . qq|
$form->{FA_Telefon}
<br>
- |.$locale->text('Fax. : ').qq|
+ | . $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|">
+ <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>
<br>
<br>
- |.$locale->text('Öffnungszeiten').qq|
+ | . $locale->text('Öffnungszeiten') . qq|
<br>
$oeffnungszeiten
<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|
+
+ 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|
+ | . $locale->text('Bankverbindungen') . qq|
<table>
<tr>
<td>
$form->{FA_Bankbezeichnung_1}
<br>
- |.$locale->text('Konto: ').qq|
+ | . $locale->text('Konto: ') . qq|
$form->{FA_Kontonummer_1}
<br>
- |.$locale->text('BLZ: ').qq|
+ | . $locale->text('BLZ: ') . qq|
$form->{FA_BLZ_1}
</td>
<td>
$form->{FA_Bankbezeichnung_oertlich}
<br>
- |.$locale->text('Konto: ').qq|
+ | . $locale->text('Konto: ') . qq|
$form->{FA_Kontonummer_2}
<br>
- |.$locale->text('BLZ: ').qq|
+ | . $locale->text('BLZ: ') . qq|
$form->{FA_BLZ_2}
</td>
</tr>
</table>
<br>|;
- } elsif ( $FA_1 ) {
- print qq|
+ } elsif ($FA_1) {
+ print qq|
<br>
- |.$locale->text('Bankverbindung').qq|
+ | . $locale->text('Bankverbindung') . qq|
<br>
<br>
$form->{FA_Bankbezeichnung_1}
<br>
- |.$locale->text('Konto: ').qq|
+ | . $locale->text('Konto: ') . qq|
$form->{FA_Kontonummer_1}
<br>
- |.$locale->text('BLZ: ').qq|
+ | . $locale->text('BLZ: ') . qq|
$form->{FA_BLZ_1} <br>
<br>|;
- } elsif ( $FA_2 ) {
- print qq|
+ } elsif ($FA_2) {
+ print qq|
<br>
- |.$locale->text('Bankverbindung').qq|
+ | . $locale->text('Bankverbindung') . qq|
<br>
<br>
$form->{FA_Bankbezeichnung_oertlich}
<br>
- |.$locale->text('Konto: ').qq|
+ | . $locale->text('Konto: ') . qq|
$form->{FA_Kontonummer_2}
<br>
- |.$locale->text('BLZ: ').qq|
+ | . $locale->text('BLZ: ') . qq|
$form->{FA_BLZ_2}
- |;
- }
- print qq|
+ |;
+ }
+ print qq|
</fieldset>
<br>
<fieldset>
<legend>
- <b>|.$locale->text('Ausgabeformat').qq|</b>
+ <b>| . $locale->text('Ausgabeformat') . qq|</b>
</legend>
|;
-
- &show_options;
- my $ausgabe = '1';
- print qq|
+
+ &show_options;
+ my $ausgabe = '1';
+ print qq|
</fieldset>
|;
-
-
-
- # Stichtag der nächsten USTVA berechnen
- #
- # ($stichtag, $tage_bis, $ical) = FA->stichtag($today[dd.mm.yyyy],
- # $FA_dauerfrist[1,0],
- # $FA_voranmeld[month, quarter])
- #$tmpdateform= $myconfig{dateformat};
- # $myconfig{dateformat}= "dd.mm.yyyy";
- # $form->{today} = $form->datetonum($form->current_date(\%myconfig), \%myconfig);
- # ($stichtag, $description, $tage_bis, $ical) = FA::stichtag($form->{today}, $form->{FA_dauerfrist},$form->{FA_voranmeld});
- # $form->{today} = $form->date($stichtag, \%myconfig );
- #$myconfig{dateformat}= $tmpdateform;
-
-
- #print qq|
- # <br>
- # <br>
- # <fieldset>
- # <label>
- # |.$locale->text('Anstehende Voranmeldungen').qq|
- # </label>
- # <h2 class="confirm">$stichtag<h2>
- # <h3>$description</h3>
- # <h4>$form->{today}</h4>
- #
- # </fieldset>|;
-
- } else {
- print qq|
+
+ # Stichtag der nächsten USTVA berechnen
+ #
+ # ($stichtag, $tage_bis, $ical) = FA->stichtag($today[dd.mm.yyyy],
+ # $FA_dauerfrist[1,0],
+ # $FA_voranmeld[month, quarter])
+ #$tmpdateform= $myconfig{dateformat};
+ # $myconfig{dateformat}= "dd.mm.yyyy";
+ # $form->{today} = $form->datetonum($form->current_date(\%myconfig), \%myconfig);
+ # ($stichtag, $description, $tage_bis, $ical) = FA::stichtag($form->{today}, $form->{FA_dauerfrist},$form->{FA_voranmeld});
+ # $form->{today} = $form->date($stichtag, \%myconfig );
+ #$myconfig{dateformat}= $tmpdateform;
+
+ #print qq|
+ # <br>
+ # <br>
+ # <fieldset>
+ # <label>
+ # |.$locale->text('Anstehende Voranmeldungen').qq|
+ # </label>
+ # <h2 class="confirm">$stichtag<h2>
+ # <h3>$description</h3>
+ # <h4>$form->{today}</h4>
+ #
+ # </fieldset>|;
+
+ } else {
+ print qq|
<td width="50%" valign="bottom">
<fieldset>
<legend>
- <b>|.$locale->text('Hinweise').qq|</b>
+ <b>| . $locale->text('Hinweise') . qq|</b>
</legend>
- <h2 class="confirm">Die Ausgabefunktionen sind wegen fehlender Daten deaktiviert.</h2>
+ <h2 class="confirm">Die Ausgabefunktionen sind wegen unzureichender Voreinstellungen deaktiviert.</h2>
<h3>Hilfe:</h3>
<ul>
- <li><a href="ustva.pl?path=$form->{path}&action=edit&level=Programm--Finanzamteinstellungen&login=$form->{login}&password=$form->{password}">
- Bitte 'Einstellungen' wählen um die Erweiterten UStVa Funktionen nutzen zu können.</a></li>
- <br>
- <li><a href="am.pl?path=$form->{path}&action=config&level=Programm--Preferences&login=$form->{login}&password=$form->{password}">
- Firmendaten können bei den Benutzereinstellungen verändert werden.</a></li>
+ <li> Wählen Sie im Administrationsmenü den momentanen Benutzer aus
+ (siehe Kopfzeile). Dort können Sie fehlende Firmenangaben bzw.
+ die Steuernummer ergänzen.</li>
</ul>
</fieldset>
|;
- my $ausgabe='';
- $hide = q|disabled="disabled"|;
- }
-
-
+ my $ausgabe = '';
+ $hide = q|disabled="disabled"|;
+ }
- print qq|
+ print qq|
</td>
</tr>
|;
- #}# end if report = ustva
-
+ #}# end if report = ustva
print qq|
</table>
<br>
<input type="hidden" name="address" value="$form->{address}">
<input type="hidden" name="reporttype" value="custom">
- <input type="hidden" name="company_street" value="$form->{company_street}">
- <input type="hidden" name="company_city" value="$form->{company_city}">
+ <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}">
<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|">
- <input type=submit class=submit name=action value="|.$locale->text('Config').qq|">
+ <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|">
+ <input type=submit class=submit name=action value="|
+ . $locale->text('Help') . qq|">
<!-- </form>-->
</td>
</tr>
</body>
</html>
|;
-
$lxdebug->leave_sub();
}
# parse help documents under doc
my $tmp = $form->{templates};
$form->{templates} = 'doc';
- $form->{help} = 'ustva';
- $form->{type} = 'help';
- $form->{format} = 'html';
+ $form->{help} = 'ustva';
+ $form->{type} = 'help';
+ $form->{format} = 'html';
&generate_ustva();
+
#$form->{templates} = $tmp;
$lxdebug->leave_sub();
}
-
-sub show {
+sub show {
$lxdebug->enter_sub();
-#&generate_ustva();
-no strict 'refs';
-&{$form->{nextsub}} ;
-use strict 'refs';
+ #&generate_ustva();
+ no strict 'refs';
$lxdebug->leave_sub();
-};
+ &{ $form->{nextsub} };
+ use strict 'refs';
+}
sub ustva_vorauswahl {
$lxdebug->enter_sub();
- #Aktuelles Datum zerlegen:
- $locale->date(\%myconfig, $form->current_date(\%myconfig,'0','0'), 0)=~ /(\d\d).(\d\d).(\d\d\d\d)/;
- #$locale->date($myconfig, $form->current_date($myconfig), 0)=~ /(\d\d).(\d\d).(\d\d\d\d)/;
- $form->{day}= $1;
- $form->{month}= $2;
- $form->{year}= $3;
- my $sel='';
- my $yymmdd='';
- # Testdaten erzeugen:
- #$form->{day}= '11';
- #$form->{month}= '01';
- #$form->{year}= 2004;
- print qq|
+ #Aktuelles Datum zerlegen:
+ $locale->date(\%myconfig, $form->current_date(\%myconfig, '0', '0'), 0) =~
+ /(\d\d).(\d\d).(\d\d\d\d)/;
+
+ #$locale->date($myconfig, $form->current_date($myconfig), 0)=~ /(\d\d).(\d\d).(\d\d\d\d)/;
+ $form->{day} = $1;
+ $form->{month} = $2;
+ $form->{year} = $3;
+ my $sel = '';
+ my $yymmdd = '';
+
+ # Testdaten erzeugen:
+ #$form->{day}= '11';
+ #$form->{month}= '01';
+ #$form->{year}= 2004;
+ print 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'){
- # Vorauswahl bei monatlichem Voranmeldungszeitraum
- print qq|
- <select name="duetyp" id=zeitraum title="|.$locale->text('Hier den Berechnungszeitraum auswählen...').qq|">
+
+ if ($form->{FA_voranmeld} eq 'month') {
+
+ # Vorauswahl bei monatlichem Voranmeldungszeitraum
+ print qq|
+ <select name="duetyp" id=zeitraum title="|
+ . $locale->text('Hier den Berechnungszeitraum auswählen...') . qq|">
|;
- my %liste = ('01' => 'January',
- '02' => 'February',
- '03' => 'March',
- '04' => 'April',
- '05' => 'May',
- '06' => 'June',
- '07' => 'July',
- '08' => 'August',
- '09' => 'September',
- '10' => 'October',
- '11' => 'November',
- '12' => 'December');
-
- my $yy = $form->{year}* 10000;
- $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
- $sel='';
- my $dfv = '0'; # 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='12';
- last SWITCH;
- };
- $yymmdd <= ($yy + 210 + $dfv) && do {
- $sel='01';
- last SWITCH;
- };
- $yymmdd <= ($yy + 310 + $dfv) && do {
- $sel='02';
- last SWITCH;
- };
- $yymmdd <= ($yy + 410 + $dfv) && do {
- $sel='03';
- last SWITCH;
- };
- $yymmdd <= ($yy + 510 + $dfv) && do {
- $sel='04';
- last SWITCH;
- };
- $yymmdd <= ($yy + 610 + $dfv) && do {
- $sel='05';
- last SWITCH;
- };
- $yymmdd <= ($yy + 710 + $dfv) && do {
- $sel='06';
- last SWITCH;
- };
- $yymmdd <= ($yy + 810 + $dfv) && do {
- $sel='07';
- last SWITCH;
- };
- $yymmdd <= ($yy + 910 + $dfv) && do {
- $sel='08';
- last SWITCH;
- };
- $yymmdd <= ($yy + 1010 + $dfv) && do {
- $sel='09';
- last SWITCH;
- };
- $yymmdd <= ($yy + 1110 + $dfv) && do {
- $sel='10';
- last SWITCH;
- };
- $yymmdd <= ($yy + 1210) && do {
- $sel='11';
- last SWITCH;
- };
- $yymmdd <= ($yy + 1231) && do {
- $sel='12';
- last SWITCH;
- };
-
- };
- my $key = '';
- foreach $key ( sort keys %liste ){
- my $selected = '';
- $selected = 'selected' if ( $sel eq $key );
- print qq|
- <option value="$key" $selected>|.$locale->text("$liste{$key}").qq|</option>
+ my %liste = ('01' => 'January',
+ '02' => 'February',
+ '03' => 'March',
+ '04' => 'April',
+ '05' => 'May',
+ '06' => 'June',
+ '07' => 'July',
+ '08' => 'August',
+ '09' => 'September',
+ '10' => 'October',
+ '11' => 'November',
+ '12' => 'December');
+
+ my $yy = $form->{year} * 10000;
+ $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
+ $sel = '';
+ my $dfv = '0'; # 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 = '12';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 210 + $dfv) && do {
+ $sel = '01';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 310 + $dfv) && do {
+ $sel = '02';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 410 + $dfv) && do {
+ $sel = '03';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 510 + $dfv) && do {
+ $sel = '04';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 610 + $dfv) && do {
+ $sel = '05';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 710 + $dfv) && do {
+ $sel = '06';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 810 + $dfv) && do {
+ $sel = '07';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 910 + $dfv) && do {
+ $sel = '08';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 1010 + $dfv) && do {
+ $sel = '09';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 1110 + $dfv) && do {
+ $sel = '10';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 1210) && do {
+ $sel = '11';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 1231) && do {
+ $sel = '12';
+ last SWITCH;
+ };
+
+ }
+ my $key = '';
+ foreach $key (sort keys %liste) {
+ my $selected = '';
+ $selected = 'selected' if ($sel eq $key);
+ print qq|
+ <option value="$key" $selected>|
+ . $locale->text("$liste{$key}")
+ . qq|</option>
|;
- }
- print qq|</select>|;
+ }
+ print qq|</select>|;
+
+ } elsif ($form->{FA_voranmeld} eq 'quarter') {
- } elsif ($form->{FA_voranmeld} eq 'quarter'){
- # Vorauswahl bei quartalsweisem Voranmeldungszeitraum
- my %liste = ( 'A' => '1.',
+ # Vorauswahl bei quartalsweisem Voranmeldungszeitraum
+ my %liste = ('A' => '1.',
'B' => '2.',
'C' => '3.',
- 'D' => '4.',
- );
-
- my $yy = $form->{year}* 10000;
- $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
- $sel='';
- 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';
- last SWITCH;
- };
- $yymmdd <= ($yy + 410 + $dfv) && do {
- $sel='A';
- last SWITCH;
- };
- $yymmdd <= ($yy + 710 + $dfv) && do {
- $sel='B';
- last SWITCH;
- };
- $yymmdd <= ($yy + 1010 + $dfv) && do {
- $sel='C';
- last SWITCH;
- };
- $yymmdd <= ($yy + 1231) && do {
- $sel='D';
- };
- };
-
- print qq|<select id="zeitraum" name="duetyp" title="|.$locale->text('Select a period').qq|" >|;
- my $key = '';
- foreach $key ( sort keys %liste ){
- my $selected = '';
- $selected = 'selected' if ( $sel eq $key );
- print qq|
- <option value="$key" $selected>$liste{$key} |.$locale->text('Quarter').qq|</option>
+ 'D' => '4.',);
+
+ my $yy = $form->{year} * 10000;
+ $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
+ $sel = '';
+ 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';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 410 + $dfv) && do {
+ $sel = 'A';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 710 + $dfv) && do {
+ $sel = 'B';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 1010 + $dfv) && do {
+ $sel = 'C';
+ last SWITCH;
+ };
+ $yymmdd <= ($yy + 1231) && do {
+ $sel = 'D';
+ };
+ }
+
+ print qq|<select id="zeitraum" name="duetyp" title="|
+ . $locale->text('Select a period') . qq|" >|;
+ my $key = '';
+ foreach $key (sort keys %liste) {
+ my $selected = '';
+ $selected = 'selected' if ($sel eq $key);
+ print qq|
+ <option value="$key" $selected>$liste{$key} |
+ . $locale->text('Quarter')
+ . qq|</option>
|;
}
- print qq|\n</select>
+ print qq|\n</select>
|;
- } else {
-
- # keine Vorauswahl bei Voranmeldungszeitraum
- print qq|<select id="zeitraum" name="duetyp" title="|.$locale->text('Select a period').qq|" >|;
-
- my %listea = ( 'A' => '1.',
- 'B' => '2.',
- 'C' => '3.',
- 'D' => '4.',
- );
-
- my %listeb = ( '01' => 'January',
- '02' => 'February',
- '03' => 'March',
- '04' => 'April',
- '05' => 'May',
- '06' => 'June',
- '07' => 'July',
- '08' => 'August',
- '09' => 'September',
- '10' => 'October',
- '11' => 'November',
- '12' => 'December',
- );
- my $key = '';
- foreach $key ( sort keys %listea ){
- print qq|
- <option value="$key">$listea{$key} |.$locale->text('Quarter').qq|</option>
+ } else {
+
+ # keine Vorauswahl bei Voranmeldungszeitraum
+ print qq|<select id="zeitraum" name="duetyp" title="|
+ . $locale->text('Select a period') . qq|" >|;
+
+ my %listea = ('A' => '1.',
+ 'B' => '2.',
+ 'C' => '3.',
+ 'D' => '4.',);
+
+ my %listeb = ('01' => 'January',
+ '02' => 'February',
+ '03' => 'March',
+ '04' => 'April',
+ '05' => 'May',
+ '06' => 'June',
+ '07' => 'July',
+ '08' => 'August',
+ '09' => 'September',
+ '10' => 'October',
+ '11' => 'November',
+ '12' => 'December',);
+ my $key = '';
+ foreach $key (sort keys %listea) {
+ print qq|
+ <option value="$key">$listea{$key} |
+ . $locale->text('Quarter')
+ . qq|</option>
|;
- }
+ }
- foreach $key ( sort keys %listeb ){
- print qq|
- <option value="$key">|.$locale->text("$listeb{$key}").qq|</option>
+ foreach $key (sort keys %listeb) {
+ print qq|
+ <option value="$key">| . $locale->text("$listeb{$key}") . qq|</option>
|;
- }
- print qq|</select>|;
- }
+ }
+ print qq|</select>|;
+ }
$lxdebug->leave_sub();
}
-
-sub config {
+sub config {
$lxdebug->enter_sub();
edit();
$lxdebug->leave_sub();
}
-
-
sub debug {
+ $lxdebug->enter_sub();
$form->debug();
+ $lxdebug->leave_sub();
}
-
+
sub show_options {
$lxdebug->enter_sub();
-# $form->{PD}{$form->{type}} = "selected";
-# $form->{DF}{$form->{format}} = "selected";
-# $form->{OP}{$form->{media}} = "selected";
-# $form->{SM}{$form->{sendmode}} = "selected";
- my $type = qq| <input type=hidden name="type" value="ustva">|;
- my $media = qq| <input type=hidden name="media" value="screen">|;
- my $format = qq| <option value=html selected>|.$locale->text('Vorschau').qq|</option>|;
+
+ # $form->{PD}{$form->{type}} = "selected";
+ # $form->{DF}{$form->{format}} = "selected";
+ # $form->{OP}{$form->{media}} = "selected";
+ # $form->{SM}{$form->{sendmode}} = "selected";
+ my $type = qq| <input type=hidden name="type" value="ustva">|;
+ my $media = qq| <input type=hidden name="media" value="screen">|;
+ my $format =
+ qq| <option value=html selected>|
+ . $locale->text('Vorschau')
+ . qq|</option>|;
if ($latex) {
- $format .= qq| <option value=pdf>|.$locale->text('UStVA als PDF-Dokument').qq|</option>|;
+ $format .=
+ qq| <option value=pdf>|
+ . $locale->text('UStVA als PDF-Dokument')
+ . qq|</option>|;
}
-
- #my $disabled= qq|disabled="disabled"|;
+
+ #my $disabled= qq|disabled="disabled"|;
#$disabled='' if ($form->{elster} eq '1' );
- if ($form->{elster} eq '1'){
- $format .= qq|<option value=elster>|.$locale->text('ELSTER Export nach Winston').qq|</option>|;
+ if ($form->{elster} eq '1') {
+ $format .=
+ qq|<option value=elster>|
+ . $locale->text('ELSTER Export nach Winston')
+ . qq|</option>|;
}
+
#$format .= qq|<option value=elster>|.$locale->text('ELSTER Export nach Winston').qq|</option>|;
print qq|
$type
$media
- <select name=format title = "|.$locale->text('Ausgabeformat auswählen...').qq|">$format</select>
+ <select name=format title = "|
+ . $locale->text('Ausgabeformat auswählen...')
+ . qq|">$format</select>
|;
$lxdebug->leave_sub();
}
sub generate_ustva {
$lxdebug->enter_sub();
- # Aufruf von get_config aus bin/mozilla/ustva.pl zum
+
+ # Aufruf von get_config aus bin/mozilla/ustva.pl zum
# Einlesen der Finanzamtdaten aus finanzamt.ini
get_config($userspath, 'finanzamt.ini');
# form vars initialisieren
- my @anmeldungszeitraum = qw('0401' '0402' '0403' '0404' '0405' '0405' '0406' '0407' '0408' '0409' '0410' '0411' '0412' '0441' '0442' '0443' '0444');
+ my @anmeldungszeitraum =
+ qw('0401' '0402' '0403' '0404' '0405' '0405' '0406' '0407' '0408' '0409' '0410' '0411' '0412' '0441' '0442' '0443' '0444');
my $item = '';
foreach $item (@anmeldungszeitraum) {
$form->{$item} = "";
}
- if ($form->{reporttype} eq "custom"){
+ if ($form->{reporttype} eq "custom") {
+
#forgotten the year --> thisyear
- if ($form->{year} !~ m/^\d\d\d\d$/ ) {
- $locale->date(\$myconfig, $form->current_date(\$myconfig), 0)=~ /(\d\d\d\d)/;
- $form->{year}= $1;
+ if ($form->{year} !~ m/^\d\d\d\d$/) {
+ $locale->date(\$myconfig, $form->current_date(\$myconfig), 0) =~
+ /(\d\d\d\d)/;
+ $form->{year} = $1;
}
+
#yearly report
- if ($form->{duetyp} eq "13" ){
- $form->{fromdate}="1.1.$form->{year}";
- $form->{todate}="31.12.$form->{year}";
+ if ($form->{duetyp} eq "13") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
}
- #Quater reports
- if ($form->{duetyp} eq "A" ){
- $form->{fromdate}="1.1.$form->{year}";
- $form->{todate}="31.3.$form->{year}";
- $form->{'0441'} = "X";
+
+ #Quater reports
+ if ($form->{duetyp} eq "A") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.3.$form->{year}";
+ $form->{'0441'} = "X";
}
- if ($form->{duetyp} eq "B" ){
- $form->{fromdate}="1.4.$form->{year}";
- $form->{todate}="30.6.$form->{year}";
- $form->{'0442'} = "X";
+ if ($form->{duetyp} eq "B") {
+ $form->{fromdate} = "1.4.$form->{year}";
+ $form->{todate} = "30.6.$form->{year}";
+ $form->{'0442'} = "X";
}
- if ($form->{duetyp} eq "C" ){
- $form->{fromdate}="1.7.$form->{year}";
- $form->{todate}="30.9.$form->{year}";
- $form->{'0443'} = "X";
+ if ($form->{duetyp} eq "C") {
+ $form->{fromdate} = "1.7.$form->{year}";
+ $form->{todate} = "30.9.$form->{year}";
+ $form->{'0443'} = "X";
}
- if ($form->{duetyp} eq "D" ){
- $form->{fromdate}="1.10.$form->{year}";
- $form->{todate}="31.12.$form->{year}";
- $form->{'0444'} = "X";
+ if ($form->{duetyp} eq "D") {
+ $form->{fromdate} = "1.10.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ $form->{'0444'} = "X";
}
-
+
#Monthly reports
- SWITCH: {
- $form->{duetyp} eq "01" && do {
- $form->{fromdate}="1.1.$form->{year}";
- $form->{todate}="31.1.$form->{year}";
- $form->{'0401'} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "02" && do {
- $form->{fromdate}="1.2.$form->{year}";
- #this works from 1901 to 2099, 1900 and 2100 fail.
- my $leap=($form->{year} % 4 == 0) ? "29" : "28";
- $form->{todate}="$leap.2.$form->{year}";
- $form->{"0402"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "03" && do {
- $form->{fromdate}="1.3.$form->{year}";
- $form->{todate}="31.3.$form->{year}";
- $form->{"0403"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "04" && do {
- $form->{fromdate}="1.4.$form->{year}";
- $form->{todate}="30.4.$form->{year}";
- $form->{"0404"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "05" && do {
- $form->{fromdate}="1.5.$form->{year}";
- $form->{todate}="31.5.$form->{year}";
- $form->{"0405"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "06" && do {
- $form->{fromdate}="1.6.$form->{year}";
- $form->{todate}="30.6.$form->{year}";
- $form->{"0406"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "07" && do {
- $form->{fromdate}="1.7.$form->{year}";
- $form->{todate}="31.7.$form->{year}";
- $form->{"0407"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "08" && do {
- $form->{fromdate}="1.8.$form->{year}";
- $form->{todate}="31.8.$form->{year}";
- $form->{"0408"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "09" && do {
- $form->{fromdate}="1.9.$form->{year}";
- $form->{todate}="30.9.$form->{year}";
- $form->{"0409"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "10" && do {
- $form->{fromdate}="1.10.$form->{year}";
- $form->{todate}="31.10.$form->{year}";
- $form->{"0410"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "11" && do {
- $form->{fromdate}="1.11.$form->{year}";
- $form->{todate}="30.11.$form->{year}";
- $form->{"0411"} = "X";
- last SWITCH;
- };
- $form->{duetyp} eq "12" && do {
- $form->{fromdate}="1.12.$form->{year}";
- $form->{todate}="31.12.$form->{year}";
- $form->{"0412"} = "X";
- last SWITCH;
- };
- }
- }
+ SWITCH: {
+ $form->{duetyp} eq "01" && do {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.1.$form->{year}";
+ $form->{'0401'} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "02" && do {
+ $form->{fromdate} = "1.2.$form->{year}";
+
+ #this works from 1901 to 2099, 1900 and 2100 fail.
+ my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ $form->{todate} = "$leap.2.$form->{year}";
+ $form->{"0402"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "03" && do {
+ $form->{fromdate} = "1.3.$form->{year}";
+ $form->{todate} = "31.3.$form->{year}";
+ $form->{"0403"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "04" && do {
+ $form->{fromdate} = "1.4.$form->{year}";
+ $form->{todate} = "30.4.$form->{year}";
+ $form->{"0404"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "05" && do {
+ $form->{fromdate} = "1.5.$form->{year}";
+ $form->{todate} = "31.5.$form->{year}";
+ $form->{"0405"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "06" && do {
+ $form->{fromdate} = "1.6.$form->{year}";
+ $form->{todate} = "30.6.$form->{year}";
+ $form->{"0406"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "07" && do {
+ $form->{fromdate} = "1.7.$form->{year}";
+ $form->{todate} = "31.7.$form->{year}";
+ $form->{"0407"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "08" && do {
+ $form->{fromdate} = "1.8.$form->{year}";
+ $form->{todate} = "31.8.$form->{year}";
+ $form->{"0408"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "09" && do {
+ $form->{fromdate} = "1.9.$form->{year}";
+ $form->{todate} = "30.9.$form->{year}";
+ $form->{"0409"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "10" && do {
+ $form->{fromdate} = "1.10.$form->{year}";
+ $form->{todate} = "31.10.$form->{year}";
+ $form->{"0410"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "11" && do {
+ $form->{fromdate} = "1.11.$form->{year}";
+ $form->{todate} = "30.11.$form->{year}";
+ $form->{"0411"} = "X";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "12" && do {
+ $form->{fromdate} = "1.12.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ $form->{"0412"} = "X";
+ last SWITCH;
+ };
+ }
+ }
+
#$myconfig = \%myconfig;
RP->ustva(\%myconfig, \%$form);
#??($form->{department}) = split /--/, $form->{department};
-
- $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1, 0, 0);
+
+ $form->{period} =
+ $locale->date(\%myconfig, $form->current_date(\%myconfig), 1, 0, 0);
$form->{todate} = $form->current_date($myconfig) unless $form->{todate};
# if there are any dates construct a where
if ($form->{fromdate} || $form->{todate}) {
-
+
unless ($form->{todate}) {
$form->{todate} = $form->current_date($myconfig);
}
- my $longtodate = $locale->date($myconfig, $form->{todate}, 1, 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 $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->{period} = $locale->text('for Period').qq|<br>\n$longfromdate |.$locale->text('bis').qq| $longtodate|;
+ $form->{period} =
+ $locale->text('for Period')
+ . qq|<br>\n$longfromdate |
+ . $locale->text('bis')
+ . qq| $longtodate|;
}
if ($form->{comparefromdate} || $form->{comparetodate}) {
- my $longcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 1, 0, 0);
- my $shortcomparefromdate = $locale->date(\%myconfig, $form->{comparefromdate}, 0, 0, 0);
-
- my $longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1, 0, 0);
- my $shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0, 0, 0);
-
+ my $longcomparefromdate =
+ $locale->date(\%myconfig, $form->{comparefromdate}, 1, 0, 0);
+ my $shortcomparefromdate =
+ $locale->date(\%myconfig, $form->{comparefromdate}, 0, 0, 0);
+
+ my $longcomparetodate =
+ $locale->date(\%myconfig, $form->{comparetodate}, 1, 0, 0);
+ my $shortcomparetodate =
+ $locale->date(\%myconfig, $form->{comparetodate}, 0, 0, 0);
+
$form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
- $form->{period} .= "<br>\n$longcomparefromdate ".$locale->text('bis').qq| $longcomparetodate|;
+ $form->{period} .=
+ "<br>\n$longcomparefromdate "
+ . $locale->text('bis')
+ . qq| $longcomparetodate|;
}
- $form->{Datum_heute} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 0, 0, 0);
+ $form->{Datum_heute} =
+ $locale->date(\%myconfig, $form->current_date(\%myconfig), 0, 0, 0);
# setup variables for the form
- my @a = ();
- @a = qw(company businessnumber tel fax email company_email);
+ # 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
+ 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;
-
- if ( $form->{address} ne '' ) {
- my $temp = $form->{address};
- $temp =~ s/\\n/<br \/>/;
- ($form->{company_street}, $form->{company_city}) = split("<br \/>", $temp);
+
+ if ($form->{address} ne '') {
+ my $temp = $form->{address};
+ $temp =~ s/\\n/<br \/>/;
+ ($form->{co_street}, $form->{co_city}) = split("<br \/>", $temp);
}
-
- if ($form->{format} eq 'pdf'
- or $form->{format} eq 'postscript') {
+
+ if ( $form->{format} eq 'pdf'
+ or $form->{format} eq 'postscript') {
$form->{padding} = "~~";
- $form->{bold} = "\textbf{";
+ $form->{bold} = "\textbf{";
$form->{endbold} = "}";
- $form->{br} = '\\\\';
+ $form->{br} = '\\\\';
+
- my @numbers = qw(51r 86r 97r 93r 96 43 45
- 66 62 67);
+ my @numbers = qw(51r 86r 97r 93r 96 43 45
+ 66 62 67);
my $number = '';
- foreach $number ( @numbers){
- $form->{$number} =~ s/,/~~/g;
+ # 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;
+ }
+ }
+ if ($myconfig{numberformat} eq '1000.00' or
+ $myconfig{numberformat} eq '1,000.00') {
+ foreach $number (@numbers) {
+ $form->{$number} =~ s/\./~~/g;
+ }
}
- }
- elsif ($form->{format} eq 'html') {
+ # Formatierungen für HTML Ausgabe
+ } elsif ($form->{format} eq 'html') {
$form->{padding} = " ";
- $form->{bold} = "<b>";
+ $form->{bold} = "<b>";
$form->{endbold} = "</b>";
- $form->{br} = "<br>";
+ $form->{br} = "<br>";
$form->{address} =~ s/\\n/<br \/>/;
-
- };
-
-
- if ($form->{format} eq 'elster'){
- &create_winston();
- } else {
- $form->{templates} = $myconfig{templates};
- $form->{templates} = "doc" if ($form->{type} eq 'help');
-
- $form->{IN} = "$form->{type}";
- $form->{IN} = "$form->{help}" if ($form->{type} eq 'help');
- $form->{IN} .= "-$form->{year}" if ($form->{format} eq 'pdf'
- or $form->{format} eq 'postscript');
-
- $form->{IN} .= '.tex' if ($form->{format} eq 'pdf'
- or $form->{format} eq 'postscript');
-
- $form->{IN} .= '.html' if ($form->{format} eq 'html');
- #$form->header;
- #print qq|$myconfig<br>$path|;
- $form->parse_template($myconfig, $userspath);
+
+ }
+
+ if ($form->{format} eq 'elster') {
+ &create_winston();
+ } else {
+ $form->{templates} = $myconfig{templates};
+ $form->{templates} = "doc" if ($form->{type} eq 'help');
+
+ $form->{IN} = "$form->{type}";
+ $form->{IN} = "$form->{help}" if ($form->{type} eq 'help');
+ $form->{IN} .= "-$form->{year}"
+ if ( $form->{format} eq 'pdf'
+ or $form->{format} eq 'postscript');
+
+ $form->{IN} .= '.tex'
+ if ( $form->{format} eq 'pdf'
+ or $form->{format} eq 'postscript');
+
+ $form->{IN} .= '.html' if ($form->{format} eq 'html');
+
+ #$form->header;
+ #print qq|$myconfig<br>$path|;
+ $form->parse_template($myconfig, $userspath);
}
$lxdebug->leave_sub();
}
-
sub edit {
$lxdebug->enter_sub();
-# edit all taxauthority prefs
+ # edit all taxauthority prefs
$form->header;
&get_config($userspath, 'finanzamt.ini');
-
+
#&create_steuernummer;
-
- my $land=$form->{elsterland};
- my $amt=$form->{elsterFFFF};
+
+ 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|
<form name="verzeichnis" method=post action="$form->{script}">
<table width=100%>
<tr>
- <th class="listtop">|.$locale->text('Finanzamt - Einstellungen').qq|</th>
+ <th class="listtop">|
+ . $locale->text('Finanzamt - Einstellungen')
+ . qq|</th>
</tr>
<tr>
<td>
<br>
<fieldset>
- <legend><b>|.$locale->text('Angaben zum Finanzamt').qq|</b></legend>
+ <legend><b>|
+ . $locale->text('Angaben zum Finanzamt')
+ . qq|</b></legend>
|;
+
#print qq|$form->{terminal}|;
USTVA::fa_auswahl($land, $amt, &elster_hash());
<br>
|;
my $checked = '';
- $checked ="checked" if ( $form->{method} eq 'accrual' );
+ $checked = "checked" if ($form->{method} eq 'accrual');
print qq|
<fieldset>
- <legend><b>|.$locale->text('Verfahren').qq|</b>
+ <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>
+ <label for="accrual">| . $locale->text('accrual') . qq|</label>
<br>
|;
$checked = '';
- $checked ="checked" if ( $form->{method} eq 'cash' );
+ $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>
+ <label for="cash">| . $locale->text('cash') . qq|</label>
</fieldset>
<br>
<fieldset>
- <legend><b>|.$locale->text('Voranmeldungszeitraum').qq|</b>
+ <legend><b>| . $locale->text('Voranmeldungszeitraum') . qq|</b>
</legend>
|;
$checked = '';
- $checked ="checked" if ( $form->{FA_voranmeld} eq 'month' );
+ $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>
+ <label for="month">| . $locale->text('month') . qq|</label>
<br>
|;
$checked = '';
- $checked ="checked" if ( $form->{FA_voranmeld} eq 'quarter' );
+ $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>
+ <label for="quarter">| . $locale->text('quarter') . qq|</label>
<br>
|;
$checked = '';
- $checked ="checked" if ( $form->{FA_dauerfrist} eq '1' );
+ $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>
+ <label for="">|
+ . $locale->text('Dauerfristverlängerung')
+ . qq|</label>
</fieldset>
<br>
<fieldset>
- <legend><b>|.$locale->text('Steuerberater/-in').qq|</b>
+ <legend><b>| . $locale->text('Steuerberater/-in') . qq|</b>
</legend>
|;
$checked = '';
- $checked ="checked" if ( $form->{FA_71} eq 'X' );
+ $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>
+ <label for="FA_71">|
+ . $locale->text('Verrechnung des Erstattungsbetrages erwünscht (Zeile 71)')
+ . qq|</label>
<br>
<br>-->
<table>
<tr>
<td>
- |.$locale->text('Name').qq|
+ | . $locale->text('Name') . qq|
</td>
<td>
- |.$locale->text('Straße').qq|
+ | . $locale->text('Straße') . qq|
</td>
<td>
- |.$locale->text('PLZ, Ort').qq|
+ | . $locale->text('PLZ, Ort') . qq|
</td>
<td>
- |.$locale->text('Telefon').qq|
+ | . $locale->text('Telefon') . qq|
</td>
</tr>
<tr>
<br>
<br>
<hr>
- <!--<input type=submit class=submit name=action value="|.$locale->text('debug').qq|">-->
- <input type=submit class=submit name=action value="|.$locale->text('continue').qq|">
+ <!--<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) {
+ my $variable = '';
+ foreach $variable (@variables) {
print qq|
<input name=$variable type=hidden value="$form->{$variable}">|;
}
my $steuernummer_new = '';
- #<input type=hidden name="steuernummer_new" value="$form->{$steuernummer_new}">
- print qq|
+ #<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="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">
|;
-
- @variables = qw(FA_Name FA_Strasse FA_PLZ
- FA_Ort FA_Telefon FA_Fax FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach
+
+ @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_Kontonummer_2 FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten
FA_Email FA_Internet);
-
+
foreach $variable (@variables) {
print qq|
<input name=$variable type=hidden value="$form->{$variable}">|;
}
-
+
print qq|
</form>
</body>
$lxdebug->leave_sub();
}
-
sub edit_form {
$lxdebug->enter_sub();
$form->header();
print qq|
<body>
|;
- my $elsterland = '';
- my $elster_amt = '';
- my $elsterFFFF = '';
+ my $elsterland = '';
+ my $elster_amt = '';
+ my $elsterFFFF = '';
my $elstersteuernummer = '';
- &get_config($userspath, 'finanzamt.ini') if ($form->{saved} eq $locale->text('saved'));
+ &get_config($userspath, 'finanzamt.ini')
+ if ($form->{saved} eq $locale->text('saved'));
# Auf Übergabefehler checken
- USTVA::info($locale->text('Bitte das Bundesland UND die Stadt bzw. den Einzugsbereich Ihres zuständigen Finanzamts auswählen.')) if ($form->{elsterFFFF_new} eq 'Auswahl' || $form->{elsterland_new} eq 'Auswahl');
- USTVA::info($locale->text('Es fehlen Angaben zur Versteuerung.
+ USTVA::info(
+ $locale->text(
+ 'Bitte das Bundesland UND die Stadt bzw. den Einzugsbereich Ihres zuständigen Finanzamts auswählen.'
+ ))
+ if ( $form->{elsterFFFF_new} eq 'Auswahl'
+ || $form->{elsterland_new} eq 'Auswahl');
+ USTVA::info(
+ $locale->text(
+ 'Es fehlen Angaben zur Versteuerung.
Wenn Sie Ist Versteuert sind, wählen Sie die Einnahmen/Überschuß-Rechnung aus.
- Sind Sie Soll-Versteuert und Bilanzverpflichtet, dann wählen Sie Bilanz aus.')) if ( $form->{method} eq '' );
+ Sind Sie Soll-Versteuert und Bilanzverpflichtet, dann wählen Sie Bilanz aus.'
+ ))
+ if ($form->{method} eq '');
+
# Klären, ob Variablen bereits befüllt sind UND ob veräderungen auf
- # der vorherigen Maske stattfanden: $change = 1(in der edit sub,
+ # 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';
+
+ 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 = ();
my %elster_init = %$elster_init;
-
- if ( $change eq '1' ){
+
+ if ($change eq '1') {
+
# Daten ändern
- $elsterland = $form->{elsterland_new};
- $elsterFFFF = $form->{elsterFFFF_new};
- $form->{elsterland} = $elsterland;
- $form->{elsterFFFF} = $elsterFFFF;
+ $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 = '';
- foreach $amt ( keys %{ $elster_init{$form->{elsterland}} } ) {
- $elster_amt = $amt if ($elster_init{$form->{elsterland}{$amt} eq $form->{elsterFFFF}} );
- }
+ foreach $amt (keys %{ $elster_init{ $form->{elsterland} } }) {
+ $elster_amt = $amt
+ if ($elster_init{ $form->{elsterland}{$amt} eq $form->{elsterFFFF} });
+ }
+
+ # load the predefined hash data into the FA_* Vars
+ my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort
+ FA_Telefon FA_Fax FA_PLZ_Grosskunden FA_PLZ_Postfach
+ FA_Postfach
+ FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1
+ FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich
+ FA_Oeffnungszeiten FA_Email FA_Internet);
- # load the predefined hash data into the FA_* Vars
- my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort
- FA_Telefon FA_Fax FA_PLZ_Grosskunden FA_PLZ_Postfach
- FA_Postfach
- FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1
- FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich
- FA_Oeffnungszeiten FA_Email FA_Internet);
-
for (my $i = 0; $i <= 20; $i++) {
- $form->{$variables[$i]} = $elster_init->{$elsterland}->{$elsterFFFF}->[$i];
+ $form->{ $variables[$i] } =
+ $elster_init->{$elsterland}->{$elsterFFFF}->[$i];
}
} else {
$elsterland = $form->{elsterland};
$elsterFFFF = $form->{elsterFFFF};
-
- }
+
+ }
my $stnr = $form->{steuernummer};
$stnr =~ s/\D+//g;
- my $patterncount = $form->{patterncount};
+ my $patterncount = $form->{patterncount};
my $elster_pattern = $form->{elster_pattern};
- my $delimiter = $form->{delimiter};
- my $steuernummer = '';
+ 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>
+ <th colspan="2" class="listtop">|
+ . $locale->text('Finanzamt - Einstellungen')
+ . qq|</th>
</tr>
<tr>
<td colspan=2>
<br>
<fieldset>
<legend>
- <font size="+1">|.$locale->text('Steuernummer').qq|</font>
+ <font size="+1">| . $locale->text('Steuernummer') . qq|</font>
</legend>
<br>
|;
- $steuernummer = USTVA::steuernummer_input($form->{elsterland},
- $form->{elsterFFFF}, $form->{steuernummer} );
+ $steuernummer =
+ USTVA::steuernummer_input($form->{elsterland}, $form->{elsterFFFF},
+ $form->{steuernummer});
print qq|
</H2><br>
</fieldset>
<tr>
<td align="left">
-
- <!--<input type=hidden name=nextsub value="debug">
- <input type=submit class=submit name=action value="|.$locale->text('debug').qq|">
- <input type=hidden name=nextsub value="test">
- <input type=submit class=submit name=action value="|.$locale->text('test').qq|">-->
<input type=hidden name=lastsub value="edit">
- <input type=submit class=submit name=action value="|.$locale->text('back').qq|">
- |;
- if ( $form->{warnung} eq "1" ){
+ |;
+ 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|">
+ <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|">
+ <input type=submit class=submit name=action value="|
+ . $locale->text('save') . qq|">
|;
}
|;
my @variables = qw(FA_steuerberater_name FA_steuerberater_street
- FA_steuerberater_city FA_steuerberater_tel
- FA_voranmeld method
- FA_dauerfrist FA_71 FA_Name elster
- path login password type elster_init saved
- );
+ FA_steuerberater_city FA_steuerberater_tel
+ FA_voranmeld method
+ FA_dauerfrist FA_71 elster
+ path login password type elster_init saved
+ );
my $variable = '';
foreach $variable (@variables) {
- print qq|
+ print qq|
<input name="$variable" type="hidden" value="$form->{$variable}">|;
}
print qq|
<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();
}
-
sub create_steuernummer {
$lxdebug->enter_sub();
- my $part=$form->{part};
- my $patterncount = $form->{patterncount};
- my $delimiter = $form->{delimiter};
+ 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}
- # und die parts und delimiter
-
- my $h =0;
- my $i =0;
-
- my $steuernummer_new = $part;
+ # und die parts und delimiter
+
+ my $h = 0;
+ my $i = 0;
+
+ my $steuernummer_new = $part;
my $elstersteuernummer_new = $form->{elster_FFFF};
$elstersteuernummer_new .= '0';
-
- for ( $h = 1; $h < $patterncount; $h++) {
+
+ 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"};
+ for (my $i = 1; $i <= length($elster_pattern); $i++) {
+ $steuernummer_new .= $form->{"part_$h\_$i"};
$elstersteuernummer_new .= $form->{"part_$h\_$i"};
}
}
- if ($form->{steuernummer} ne $steuernummer_new){
- $form->{steuernummer} = $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} = $steuernummer_new;
+ } else {
+ $form->{steuernummer_new} = '';
+ $form->{elstersteuernummer_new} = '';
}
$lxdebug->leave_sub();
}
-
sub get_config {
$lxdebug->enter_sub();
my ($userpath, $filename) = @_;
- my ($key, $value) = '';
- open(FACONF, "$userpath/$filename") or $form->error("$userpath/$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";
- #}
- }
+ 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;
+
# Textboxen formatieren: Linebreaks entfernen
#
#$form->{FA_Oeffnungszeiten} =~ s/\\\\n/<br>/g;
$lxdebug->leave_sub();
}
-
-
sub save {
$lxdebug->enter_sub();
- my $filename = $form->{filename};
+ my $filename = "$form->{login}_$form->{filename}";
+
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
create_steuernummer;
+
# Textboxen formatieren: Linebreaks entfernen
#
$form->{FA_Oeffnungszeiten} =~ s/\r\n/\\n/g;
+
#URL mit http:// davor?
$form->{FA_Internet} =~ s/^http:\/\///;
- $form->{FA_Internet} = 'http://'. $form->{FA_Internet};
-
- my @config = qw(elster elsterland elstersteuernummer steuernummer
- elsteramt elsterFFFF FA_Name FA_Strasse
- FA_PLZ FA_Ort FA_Telefon FA_Fax FA_PLZ_Grosskunden
- FA_PLZ_Postfach FA_Postfach FA_BLZ_1 FA_Kontonummer_1
- FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2
- FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten
- FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name
- FA_steuerberater_street FA_steuerberater_city FA_steuerberater_tel
- FA_71 FA_dauerfrist);
+ $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';
+ if ($form->{elstersteuernummer} ne '000000000') {
+ $form->{elster} = '1';
open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
+
# create the config file
print CONF qq|# Configuration file for USTVA\n\n|;
- my $key = '';
+ 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 CONF qq|$key=|;
if ($form->{$key} ne 'Y') {
print CONF qq|$form->{$key}\n|;
}
print CONF qq|\n\n|;
close CONF;
$form->{saved} = $locale->text('saved');
-
+
} else {
-
+
$form->{saved} = $locale->text('Bitte eine Steuernummer angeben');
}
sub show_fa_daten {
$lxdebug->enter_sub();
- my $readonly = $_;
- my $oeffnungszeiten = $form->{FA_Oeffnungszeiten} ;
+ 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>
+ <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|
<br>
<fieldset>
<legend>
- <b>|.$locale->text('Address').qq|</b>
+ <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>
<br>
<fieldset>
<legend>
- <b>|.$locale->text('Kontakt').qq|</b>
+ <b>| . $locale->text('Kontakt') . qq|</b>
</legend>
- |.$locale->text('Telefon').qq|<br>
+ | . $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>
+ | . $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>
+ | . $locale->text('Internet') . qq|<br>
<input name="FA_Email" size="40" title="FA_Email" value="$form->{FA_Email}" $readonly>
<br>
<br>
<br>
<fieldset>
<legend>
- <b>|.$locale->text('Öffnungszeiten').qq|</b>
+ <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|
+ 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>
+ <b>|
+ . $locale->text('Bankverbindungen des Finanzamts') . qq|</b>
<legend>
<table>
<tr>
<td>
- |.$locale->text('Kreditinstitut').qq|
+ | . $locale->text('Kreditinstitut') . qq|
<br>
<input name="FA_Bankbezeichnung_1" size="30" value="$form->{FA_Bankbezeichnung_1}" $readonly>
<br>
<br>
- |.$locale->text('Kontonummer').qq|
+ | . $locale->text('Kontonummer') . qq|
<br>
<input name="FA_Kontonummer_1" size="15" value="$form->{FA_Kontonummer_1}" $readonly>
<br>
<br>
- |.$locale->text('Bankleitzahl').qq|
+ | . $locale->text('Bankleitzahl') . qq|
<br>
<input name="FA_BLZ_1" size="15" value="$form->{FA_BLZ_1}" $readonly>
</td>
<td>
- |.$locale->text('Kreditinstitut').qq|
+ | . $locale->text('Kreditinstitut') . qq|
<br>
<input name="FA_Bankbezeichnung_oertlich" size="30" value="$form->{FA_Bankbezeichnung_oertlich}" $readonly>
<br>
<br>
- |.$locale->text('Kontonummer').qq|
+ | . $locale->text('Kontonummer') . qq|
<br>
<input name="FA_Kontonummer_2" size="15" value="$form->{FA_Kontonummer_2}" $readonly>
<br>
<br>
- |.$locale->text('Bankleitzahl').qq|
+ | . $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 ) {
+ |;
+ } elsif ($FA_1) {
print qq|
<fieldset>
<legend>
- <b>|.$locale->text('Bankverbindung des Finanzamts').qq|</b>
+ <b>|
+ . $locale->text('Bankverbindung des Finanzamts') . qq|</b>
<legend>
- |.$locale->text('Kontonummer').qq|
+ | . $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|
+ | . $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|
+ | . $locale->text('Kreditinstitut') . qq|
<br>
<input name="FA_Bankbezeichnung_1" size="15" value="$form->{FA_Bankbezeichnung_1}" $readonly>
<br>
print qq|
<fieldset>
<legend>
- <b>|.$locale->text('Bankverbindung des Finanzamts').qq|</b>
+ <b>|
+ . $locale->text('Bankverbindung des Finanzamts') . qq|</b>
<legend>
- |.$locale->text('Kontonummer').qq|
+ | . $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|
+ | . $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|
+ | . $locale->text('Kreditinstitut') . qq|
<br>
<input name="FA_Bankbezeichnung_oertlich" size="15" value="$form->{FA_Bankbezeichnung_oertlich}" $readonly>
</fieldset>
- |;
+ |;
}
print qq|
</td>
$lxdebug->leave_sub();
}
-
-
sub create_winston {
$lxdebug->enter_sub();
&get_config($userspath, 'finanzamt.ini');
# In lack of availability linux users may use windows pendants. I choose
# WINSTON, because it's free of coast, it has an API and its tested under
# Linux using WINE.
- # The author of WINSTON developed some c-code to realize ELSTER under
+ # The author of WINSTON developed some c-code to realize ELSTER under
# WINDOWS and Linux (http://www.felfri.de/fa_xml/). Next year (2005) I start to
- # develop a server side solution for LX-Office ELSTER under Linux and
+ # develop a server side solution for LX-Office ELSTER under Linux and
# WINDOWS based on this c-code.
#
# You need to download WINSTON from http://www.felfri.de/winston/
- # There (http://www.felfri.de/winston/download.htm) you'll find instructions
+ # There (http://www.felfri.de/winston/download.htm) you'll find instructions
# about WINSTON under Linux WINE
# More infos about Winstons API: http://www.felfri.de/winston/schnittstellen.htm
- my $azr ='';
- my $file = ''; # Filename for Winstonfile
- $file .= 'U'; # 1. char 'U' = USTVA
-
- SWITCH: { # 2. and 3. char 01-12= Month 41-44= Quarter (azr:Abrechnungszeitraum)
- $form->{duetyp} eq "01" && do {
- $azr = "01";
- last SWITCH;
- };
- $form->{duetyp} eq "02" && do {
- $azr = "02";
- last SWITCH;
- };
- $form->{duetyp} eq "03" && do {
- $azr = "03";
- last SWITCH;
- };
- $form->{duetyp} eq "04" && do {
- $azr = "04";
- last SWITCH;
- };
- $form->{duetyp} eq "05" && do {
- $azr = "05";
- last SWITCH;
- };
- $form->{duetyp} eq "06" && do {
- $azr = "06";
- last SWITCH;
- };
- $form->{duetyp} eq "07" && do {
- $azr = "07";
- last SWITCH;
- };
- $form->{duetyp} eq "08" && do {
- $azr = "08";
- last SWITCH;
- };
- $form->{duetyp} eq "09" && do {
- $azr = "09";
- last SWITCH;
- };
- $form->{duetyp} eq "10" && do {
- $azr = "10";
- last SWITCH;
- };
- $form->{duetyp} eq "11" && do {
- $azr = "11";
- last SWITCH;
- };
- $form->{duetyp} eq "12" && do {
- $azr = "12";
- last SWITCH;
- };
- $form->{duetyp} eq "A" && do {
- $azr = "41";
- last SWITCH;
- };
- $form->{duetyp} eq "B" && do {
- $azr = "42";
- last SWITCH;
- };
- $form->{duetyp} eq "C" && do {
- $azr = "43";
- last SWITCH;
- };
- $form->{duetyp} eq "D" && do {
- $azr = "44";
- last SWITCH;
- };
- do {
- $form->error("Ungültiger Anmeldezeitraum.\n
+ my $azr = '';
+ my $file = ''; # Filename for Winstonfile
+ $file .= 'U'; # 1. char 'U' = USTVA
+
+SWITCH:
+ { # 2. and 3. char 01-12= Month 41-44= Quarter (azr:Abrechnungszeitraum)
+ $form->{duetyp} eq "01" && do {
+ $azr = "01";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "02" && do {
+ $azr = "02";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "03" && do {
+ $azr = "03";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "04" && do {
+ $azr = "04";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "05" && do {
+ $azr = "05";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "06" && do {
+ $azr = "06";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "07" && do {
+ $azr = "07";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "08" && do {
+ $azr = "08";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "09" && do {
+ $azr = "09";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "10" && do {
+ $azr = "10";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "11" && do {
+ $azr = "11";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "12" && do {
+ $azr = "12";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "A" && do {
+ $azr = "41";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "B" && do {
+ $azr = "42";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "C" && do {
+ $azr = "43";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "D" && do {
+ $azr = "44";
+ last SWITCH;
+ };
+ do {
+ $form->error(
+ "Ungültiger Anmeldezeitraum.\n
Sie können für ELSTER nur einen monatlichen oder
- quartalsweisen Anmeldezeitraum auswählen.");
- };
+ quartalsweisen Anmeldezeitraum auswählen."
+ );
+ };
}
- $file .= $azr;
+ $file .= $azr;
+
#4. and 5. char = year modulo 100
- $file .= sprintf("%02d", $form->{year}%100);
+ $file .= sprintf("%02d", $form->{year} % 100);
#6. to 18. char = Elstersteuernummer
- #Beispiel: Steuernummer in Bayern
+ #Beispiel: Steuernummer in Bayern
#111/222/33334 ergibt für UStVA Jan 2004: U01049111022233334
-
+
$file .= $form->{elsterFFFF};
$file .= $form->{elstersteuernummer};
$file .= '.xml';
$form->{elsterfile} = $file;
-
+
#Calculations
-
- my $k51 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"51"})); # Umsätze zu 16% USt
- my $k86 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"86"})); # Umsätze zu 7% USt
- my $k97 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"97"})); # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
- my $k93 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"93"})); # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
- my $k94 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"94"})); # neuer Fahrzeuge von Lieferern
- my $k66 = $form->parse_amount(\%myconfig, $form->{"66"}) * 100;# Vorsteuer 7% plus 16%
- my $k83 = $form->parse_amount(\%myconfig, $form->{"67"}) * 100;# Umsätze zu 7% USt
- my $k96 = $form->parse_amount(\%myconfig, $form->{"96"}) * 100;#
- #
- # Now build the xml content
- #
-
- $form->{elster}= qq|<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+ my $k51 =
+ sprintf("%d", $form->parse_amount(\%myconfig, $form->{"51"}))
+ ; # Umsätze zu 16% USt
+ my $k86 =
+ sprintf("%d", $form->parse_amount(\%myconfig, $form->{"86"}))
+ ; # Umsätze zu 7% USt
+ my $k97 =
+ sprintf("%d", $form->parse_amount(\%myconfig, $form->{"97"}))
+ ; # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
+ my $k93 =
+ sprintf("%d", $form->parse_amount(\%myconfig, $form->{"93"}))
+ ; # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
+ my $k94 =
+ sprintf("%d", $form->parse_amount(\%myconfig, $form->{"94"}))
+ ; # neuer Fahrzeuge von Lieferern
+ my $k66 =
+ $form->parse_amount(\%myconfig, $form->{"66"}) *
+ 100; # Vorsteuer 7% plus 16%
+ my $k83 =
+ $form->parse_amount(\%myconfig, $form->{"67"}) * 100; # Umsätze zu 7% USt
+ my $k96 = $form->parse_amount(\%myconfig, $form->{"96"}) * 100; #
+ #
+ # Now build the xml content
+ #
+
+ $form->{elster} = qq|<?xml version="1.0" encoding="ISO-8859-1" ?>
<!-- Diese Datei ist mit Lx-Office $form->{version} generiert -->
<WinstonAusgang>
<Formular Typ="UST"></Formular>
<AnmeldeJahr>$form->{year}</AnmeldeJahr>
<AnmeldeZeitraum>$azr</AnmeldeZeitraum>
|;
-
+
$form->{elster} .= qq|<Kennzahl Nr="51">$k51</Kennzahl>\n| if ($k51 ne '0');
$form->{elster} .= qq|<Kennzahl Nr="86">$k86</Kennzahl>\n| if ($k86 ne '0');
$form->{elster} .= qq|<Kennzahl Nr="97">$k97</Kennzahl>\n| if ($k97 ne '0');
$form->{elster} .= qq|<Kennzahl Nr="66">$k66</Kennzahl>\n| if ($k66 ne '0');
$form->{elster} .= qq|<Kennzahl Nr="83">$k83</Kennzahl>\n| if ($k83 ne '0');
$form->{elster} .= qq|\n</WinstonAusgang>\n\n|;
-
+
#$form->header;
#print qq|$form->{elsterfile}|;
#print qq|$form->{elster}|;
$SIG{INT} = 'IGNORE';
-
+
&save_winston;
$lxdebug->leave_sub();
}
-
sub save_winston {
$lxdebug->enter_sub();
- my $elster = $form->{elster};
+ my $elster = $form->{elster};
my $elsterfile = $form->{elsterfile};
open(OUT, ">-") or $form->error("STDOUT : $!");
- print OUT qq|Content-Type: application/file;
+ print OUT qq|Content-Type: application/file;
Content-Disposition: attachment; filename="$elsterfile"\n\n|;
- print OUT $elster;
+ print OUT $elster;
close(OUT);
$lxdebug->leave_sub();
}
sub continue {
$lxdebug->enter_sub();
-# allow Symbolic references just here:
-no strict 'refs';
-&{$form->{nextsub}};
-use strict 'refs';
+ # allow Symbolic references just here:
+ no strict 'refs';
+ &{ $form->{nextsub} };
+ use strict 'refs';
$lxdebug->leave_sub();
}
-sub back { &{$form->{lastsub}} };
+sub back {
+ $lxdebug->enter_sub();
+ &{ $form->{lastsub} };
+ $lxdebug->leave_sub();
+}
sub elster_hash {
$lxdebug->enter_sub();
my $finanzamt = USTVA::query_finanzamt(\%myconfig, \%$form);
$lxdebug->leave_sub();
- return $finanzamt
+ return $finanzamt;
}
sub test {
$lxdebug->enter_sub();
-# biegt nur den Testeintrag in Programm->Test auf eine Routine um
-$form->header;
-&elster_send;
+ # biegt nur den Testeintrag in Programm->Test auf eine Routine um
+
+ $form->header;
+ &elster_send;
$lxdebug->leave_sub();
}
-
sub elster_send {
$lxdebug->enter_sub();
+
#read config
my $elster_conf = &elster_conf();
&elster_xml();
use Cwd;
- $form->{cwd} = cwd();
- $form->{tmpdir} = $form->{cwd} . '/' . $elster_conf->{'path'};
+ $form->{cwd} = cwd();
+ $form->{tmpdir} = $form->{cwd} . '/' . $elster_conf->{'path'};
$form->{tmpfile} = $elster_conf->{'err'};
- my $caller = $elster_conf->{'call'}[0];
-
- chdir("$form->{tmpdir}") or $form->error($form->cleanup."chdir : $!");
- my $send= "faxmlsend $caller -config etc/faxmlsend.cnf -xml faxmlsend.xml -tt faxmlsend.tt -debug";
+ my $caller = $elster_conf->{'call'}[0];
+
+ chdir("$form->{tmpdir}") or $form->error($form->cleanup . "chdir : $!");
+ my $send =
+ "faxmlsend $caller -config etc/faxmlsend.cnf -xml faxmlsend.xml -tt faxmlsend.tt -debug";
system("$send > $form->{tmpfile}");
$form->{tmpdir} .= "$elster_conf->{'path'}/";
$form->{tmpfile} = "faxmlsend.err";
- $form->error($form->cleanup."faxmlsend : OFD meldet: Error 404 \n Internetseite nicht vorhanden") if ($? eq '1024');
- $form->error($form->cleanup."faxmlsend : No such File: faxmlsend.xml \n Fehlernummer: $? \n Problem beim öffnen der faxmlsend.xml") if ($?);
+ $form->error($form->cleanup
+ . "faxmlsend : OFD meldet: Error 404 \n Internetseite nicht vorhanden")
+ if ($? eq '1024');
+ $form->error($form->cleanup
+ . "faxmlsend : No such File: faxmlsend.xml \n Fehlernummer: $? \n Problem beim öffnen der faxmlsend.xml"
+ )
+ if ($?);
+
# foreach my $line (&elster_feedback("$elster_conf->{'path'}")){
# print qq|$line\n|;
# }
print qq|Log:<br>|;
+
#for (my $i=0; $i<= )
- &elster_readlog();
+ &elster_readlog();
print qq|\n ende\n|;
$lxdebug->leave_sub();
}
-
sub elster_readlog {
$lxdebug->enter_sub();
my $elster_conf = &elster_conf();
- open(LOG, "$elster_conf->{'logfile'}") or $form->error("$elster_conf->{'logfile'}: $!");
+ open(LOG, "$elster_conf->{'logfile'}")
+ or $form->error("$elster_conf->{'logfile'}: $!");
print qq|<listing>|;
- my $log='';
- my $xml='';
- my $tmp='';
- while (<LOG>){
+ my $log = '';
+ my $xml = '';
+ my $tmp = '';
+ while (<LOG>) {
my $i = 0;
+
#$_ =~ s/</<\;/;
#$_ =~ s/>/>\;/;
$_ =~ s/\s+//mg;
+
#$_ =~ s/\015\012//mg;
$_ =~ s/</\n</mg;
+
#$_ =~ s/\n\n+//mg;
- if ($_ =~ /^\d\d\d\d\d\d/g){
+ if ($_ =~ /^\d\d\d\d\d\d/g) {
$log .= qq|$_<br>|;
- #} elsif ($_ =~ /(<([^\/]*?)>)/ ) {
- } elsif ($_ =~ /(<([^\/].*?)>(.*))/g ) {
+
+ #} elsif ($_ =~ /(<([^\/]*?)>)/ ) {
+ } elsif ($_ =~ /(<([^\/].*?)>(.*))/g) {
+
#$xml .= qq|$2 = $3\n\n|;
#$_ =~ s/\015\012//mg;
- $_=~ s/\s+//;
+ $_ =~ s/\s+//;
$xml .= qq|$_\n|;
-
+
} else {
$tmp .= qq|$_<br>|;
}
$i++;
}
+
#second parse
#my $var='';
#while (<$xml>){
#print qq|$log|;
print qq|$xml|;
print qq|</listing>|;
- # $_=$log;
- # s{<(\w+)\b([^<>]*)>
- # ((?:.(?!</?\1\b))*.)
- # (<\1>) }
- # { print "markup=",$1," args=",$2," enclosed=",$3," final=",$4 ; "" }gsex;
+
+ # $_=$log;
+ # s{<(\w+)\b([^<>]*)>
+ # ((?:.(?!</?\1\b))*.)
+ # (<\1>) }
+ # { print "markup=",$1," args=",$2," enclosed=",$3," final=",$4 ; "" }gsex;
close LOG;
$lxdebug->leave_sub();
}
-
sub elster_feedback {
$lxdebug->enter_sub();
my ($file) = @_;
print qq|feedback:<br>|;
if (-f "$file") {
open(FH, "$file");
- @content = <FH>;
+ @content = <FH>;
close(FH);
}
$lxdebug->leave_sub();
- return(@content);
+ return (@content);
}
-
sub elster_conf {
$lxdebug->enter_sub();
- my $elster_conf = {
- 'path' => 'elster',
- 'prg' => 'faxmlsend',
- 'err' => 'faxmlsend.err',
- 'ttfile' => 'faxmlsend.tt',
- 'xmlfile' => 'faxmlsend.xml',
- 'cline' => '-tt $ttfile -xml $xmlfile',
- 'call' => ['send', 'protokoll', 'anmeldesteuern'],
- 'logfile' => 'log/faxmlsend.log',
- 'conffile' => 'faxmlsend.cnf',
- 'debug' => '-debug'
- };
-
+ my $elster_conf = { 'path' => 'elster',
+ 'prg' => 'faxmlsend',
+ 'err' => 'faxmlsend.err',
+ 'ttfile' => 'faxmlsend.tt',
+ 'xmlfile' => 'faxmlsend.xml',
+ 'cline' => '-tt $ttfile -xml $xmlfile',
+ 'call' => ['send', 'protokoll', 'anmeldesteuern'],
+ 'logfile' => 'log/faxmlsend.log',
+ 'conffile' => 'faxmlsend.cnf',
+ 'debug' => '-debug' };
$lxdebug->leave_sub();
-
return $elster_conf;
+
}
sub elster_xml {
$lxdebug->enter_sub();
-
my $elster_conf = &elster_conf();
-# $k51 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"51"})); # Umsätze zu 16% USt
-# $k86 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"86"})); # Umsätze zu 7% USt
-# $k97 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"97"})); # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
-# $k93 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"93"})); # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
-# $k94 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"94"})); # neuer Fahrzeuge von Lieferern
-# $k66 = $form->parse_amount(\%myconfig, $form->{"66"}) * 100;# Vorsteuer 7% plus 16%
-# $k83 = $form->parse_amount(\%myconfig, $form->{"67"}) * 100;# Umsätze zu 7% USt
-# $k96 = $form->parse_amount(\%myconfig, $form->{"96"}) * 100;#
+
+ # $k51 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"51"})); # Umsätze zu 16% USt
+ # $k86 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"86"})); # Umsätze zu 7% USt
+ # $k97 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"97"})); # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
+ # $k93 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"93"})); # 16% Steuerpflichtige innergemeinsachftliche Erwerbe
+ # $k94 = sprintf("%d", $form->parse_amount(\%myconfig, $form->{"94"})); # neuer Fahrzeuge von Lieferern
+ # $k66 = $form->parse_amount(\%myconfig, $form->{"66"}) * 100;# Vorsteuer 7% plus 16%
+ # $k83 = $form->parse_amount(\%myconfig, $form->{"67"}) * 100;# Umsätze zu 7% USt
+ # $k96 = $form->parse_amount(\%myconfig, $form->{"96"}) * 100;#
my $TransferHeader = qq|<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="..\\Stylesheet\\ustva.xsl"?>
<Info>test</Info>
</Zusatz>
</TransferHeader>|;
-
+
my $DatenTeil = qq|
<DatenTeil>
<Nutzdatenblock>
#$DatenTeil .= qq| <Kz83>$k83</Kz83>\n| if ($k83 ne '0');
my $filename = "$elster_conf->{'path'}/$elster_conf->{'xmlfile'}";
- open(XML, ">$elster_conf->{'path'}/$elster_conf->{'xmlfile'}") or $form->error("$filename : $!");
+ open(XML, ">$elster_conf->{'path'}/$elster_conf->{'xmlfile'}")
+ or $form->error("$filename : $!");
print XML qq|$TransferHeader $DatenTeil|;
close XML;
$lxdebug->leave_sub();
projects / kivitendo-erp.git / blobdiff