-#!/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('Nov')
# $locale->text('Dec')
-# $form->parse_html_template('generic/util_hidden_variables');
-
#############################
sub report {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- my $myconfig = \%myconfig;
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
+
+ $::auth->assert('advance_turnover_tax_return');
$form->{title} = $locale->text('UStVA');
$form->{kz10} = ''; #Berichtigte Anmeldung? Ja =1 Nein=0
0, 4);
my $department = '';
- local $hide = '';
+ my $hide = '';
$form->header;
# Einlesen der Finanzamtdaten
- &get_config($userspath, 'finanzamt.ini');
+ my $ustva = USTVA->new();
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
# Hier Einlesen der user-config
- # steuernummer entfernt für prerelease
+ # steuernummer entfernt für prerelease
my @a = qw(
- signature name company address businessnumber
- tel fax email co_chief co_department
+ signature name company address businessnumber
+ tel fax email co_chief co_department
co_custom1 co_custom2 co_custom3 co_custom4 co_custom5
- co_name1 co_name2 co_street co_street1 co_zip
- co_city co_city1 co_country co_tel co_tel1
+ co_name1 co_name2 co_street co_street1 co_zip
+ co_city co_city1 co_country co_tel co_tel1
co_tel2 co_fax co_fax1 co_email co_email1
- co_url co_url1 ustid duns co_bankname
+ co_url co_url1 ustid duns co_bankname
co_bankname1 co_bankname2 co_bankname3 co_blz co_blz1
- co_blz2 co_blz3 co_accountnr co_accountnr1 co_accountnr2
+ co_blz2 co_blz3 co_accountnr co_accountnr1 co_accountnr2
co_accountnr3
);
- map { $form->{$_} = $myconfig->{$_} } @a;
+ map { $form->{$_} = $myconfig{$_} } @a;
my $openings = $form->{FA_Oeffnungszeiten};
$openings =~ s/\\\\n/<br>/g;
- my $company_given = ($form->{company} ne '')
+ my $company_given = ($form->{company} ne '')
? qq|<h3>$form->{company}</h3>\n|
- : qq|<a href=am.pl?path=$form->{path}&action=config|
- . qq|&level=Programm--Preferences&login=$form->{login}|
- . qq|&password=$form->{password}>|
+ : qq|<a href="am.pl?action=config">|
. $locale->text('No Company Name given') . 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;
}
- my $address_given =
- ($form->{co_street} ne ''
- and (
- $form->{co_zip} ne ''
- or $form->{co_city} ne ''
- )
- )
+ my $address_given =
+ ($form->{co_street} && ($form->{co_zip} || $form->{co_city}))
? qq|$form->{co_street}<br>|
. qq|$form->{co_street1}<br>|
. qq|$form->{co_zip} $form->{co_city}|
- : qq|<a href=am.pl?path=$form->{path}&action=config|
- . qq|&level=Programm--Preferences&login=$form->{login}|
- . qq|&password=$form->{password}>|
- . $locale->text('No Company Address given')
+ : 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_fax} = $form->{fax} unless $form->{co_fax};
$form->{co_url} = $form->{urlx} unless $form->{co_url};
- my $taxnumber_given = ($form->{steuernummer} ne '')
- ? qq|$form->{steuernummer}|
- : qq|<a href="ustva.pl?path=$form->{path}&action="config_step1"|
- . qq|&level=Programm--Finanzamteinstellungen&login=$form->{login}|
- . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!|
- . qq|</a><br>|;
+ my $taxnumber_given = ($form->{steuernummer} ne '') ? $form->{steuernummer} : qq|<a href="ustva.pl?action=config_step1">Keine Steuernummer hinterlegt!</a><br>|;
my $ustva_vorauswahl = &ustva_vorauswahl();
my @all_years = $form->all_years(\%myconfig);
- my $select_year = qq|<select name=year title="|
+ my $select_year = qq|<select name=year title="|
. $locale->text('Year') . qq|">|;
foreach my $key (@all_years) {
$select_year .= qq|<option |;
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');
+ . qq|">|
+ . $locale->text('Amended Advance Turnover Tax Return');
- my $method_local = ($form->{method} eq 'accrual') ? $locale->text('accrual')
+ 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},
Bankbezeichnung => $form->{FA_Bankbezeichnung_oertlich}
}
];
-
-
+
+ # Which COA is in use?
+
+ $ustva->get_coa($form, \%myconfig);
+
my $template_ref = {
- openings => $openings,
+ openings => $openings,
company_given => $company_given,
- address_given => $address_given,
+ address_given => $address_given,
taxnumber_given => $taxnumber_given,
- select_year => $select_year,
+ 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,
+ tax_office_banks => $tax_office_banks_ref,
+ select_options => &show_options,
+
};
-
+
print($form->parse_html_template('ustva/report', $template_ref));
- $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;
$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|);
$sel = '';
my $dfv = '';
- # Offset für Dauerfristverlängerung
+ # Offset für Dauerfristverlängerung
$dfv = '100' if ($form->{FA_dauerfrist} eq '1');
SWITCH: {
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: {
}
$select_vorauswahl .= qq|</select>|;
}
- $lxdebug->leave_sub();
-
+ $::lxdebug->leave_sub();
+
return $select_vorauswahl;
}
#sub config {
-# $lxdebug->enter_sub();
+# $::lxdebug->enter_sub();
# config_step1();
-# $lxdebug->leave_sub();
+# $::lxdebug->leave_sub();
#}
sub debug {
- $lxdebug->enter_sub();
- $form->debug();
- $lxdebug->leave_sub();
+ $::lxdebug->enter_sub();
+ $::form->debug();
+ $::lxdebug->leave_sub();
}
sub show_options {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
# $form->{PD}{$form->{type}} = "selected";
# $form->{DF}{$form->{format}} = "selected";
my $media = qq| <input type=hidden name="media" value="screen">|;
my $format =
qq| <option value=html selected>|
- . $locale->text('Preview')
+ . $::locale->text('Preview')
. qq|</option>|;
- if ($latex_templates) {
+ if ($::lx_office_conf{print_templates}{latex}) {
$format .=
qq| <option value=pdf>|
- . $locale->text('UStVA (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 (Winston)')
+ . $::locale->text('ELSTER Export (Winston)')
. qq|</option>|
. qq|<option value=elstertaxbird>|
- . $locale->text('ELSTER Export (Taxbird)')
- . qq|</option>|;
+ . $::locale->text('ELSTER Export (Taxbird)')
+ . qq|</option>|;
}
#$format .= qq|<option value=elster>|.$locale->text('ELSTER Export nach Winston').qq|</option>|;
$type
$media
<select name=format title = "|
- . $locale->text('Choose Outputformat') . 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();
+
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
+
+ $::auth->assert('advance_turnover_tax_return');
- # Aufruf von get_config aus bin/mozilla/ustva.pl zum
- # Einlesen der Finanzamtdaten aus finanzamt.ini
+ # Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini
- get_config($userspath, 'finanzamt.ini');
+ 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";
};
}
-
-
+ # Kontrollvariablen für die Templates
+ $form->{"year$_"} = ($form->{year} >= $_ ) ? "1":"0" for 2007..2107;
# Get the USTVA
- USTVA->ustva(\%myconfig, \%$form);
+ $ustva->ustva(\%myconfig, \%$form);
# reformat Dates to dateformat
$form->{fromdate} = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
# 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} =
$form->{co_city} =~ s/\\n//g;
}
+ ################################
#
- # Outputformat specific customisation's
+ # Nation specific customisations
#
+ ################################
- my @category_cent = qw(
- 511 861 36 80 971 931 98 96 53 74
- 85 65 66 61 62 67 63 64 59 69
- 39 83 811 891 Z43 Z45 Z53 Z62 Z65 Z67
-
- );
+ # Germany
- my @category_euro = qw(
- 41 44 49 43 48 51 86 35 77 76 91 89
- 97 93 95 94 42 60 45 52 73 84 81
- );
+ if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU') {
- if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') {
+ #
+ # Outputformat specific customisation's
+ #
- $form->{IN} = "$form->{type}-$form->{year}.tex";
- $form->{padding} = "~~";
- $form->{bold} = "\textbf{";
- $form->{endbold} = "}";
- $form->{br} = '\\\\';
+ my @category_cent = $ustva->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '2',
+ });
- # Zahlenformatierung für Latex USTVA Formulare
+ push @category_cent, qw(83 Z43 Z45 Z53 Z62 Z65 Z67);
- foreach my $number (@category_euro) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '');
- }
+ my @category_euro = $ustva->report_variables({
+ myconfig => \%myconfig,
+ form => $form,
+ type => '',
+ attribute => 'position',
+ dec_places => '0',
+ });
- my ${decimal_comma} = ( $myconfig{numberformat} eq '1.000,00'
- or $myconfig{numberformat} eq '1000,00' ) ? ',':'.';
+ $form->{id} = [];
+ $form->{amount} = [];
- foreach my $number (@category_cent) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '');
- $form->{$number} =~ s/${decimal_comma}/~~/g;
- }
+ if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') {
- } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
+ $form->{IN} = "$form->{type}-$form->{year}.tex";
+ $form->{padding} = "~~";
+ $form->{bold} = "\textbf{";
+ $form->{endbold} = "}";
+ $form->{br} = '\\\\';
- $form->{IN} = $form->{type} . '.html';
- $form->{padding} = " ";
- $form->{bold} = "<b>";
- $form->{endbold} = "</b>";
- $form->{br} = "<br>";
- $form->{address} =~ s/\\n/\n/g;
+ # Zahlenformatierung für Latex USTVA Formulare
- foreach $number (@category_cent) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
- }
-
- foreach $number (@category_euro) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0');
- }
+ foreach my $number (@category_euro) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '');
+ }
- } elsif ( $form->{format} eq 'elsterwinston' ) {
+ my ${decimal_comma} = ( $myconfig{numberformat} eq '1.000,00'
+ or $myconfig{numberformat} eq '1000,00' ) ? ',':'.';
- $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
- $file .= $form->{elsterFFFF};
- $file .= $form->{elstersteuernummer};
- #file suffix
- $file .= '.xml';
- $form->{tmpfile} = "$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', '') : '';
- }
-
- foreach my $number (@category_euro) {
- $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
- }
- # Re-set Numberformat
- $myconfig{numberformat} = $temp_numberformat;
+ foreach my $number (@category_cent) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '');
+ $form->{$number} =~ s/${decimal_comma}/~~/g;
+ }
- }
+ } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
- elsif ( $form->{format} eq 'elstertaxbird' ) {
-
- # Define serveral filenames
- $form->{IN} = 'taxbird.txb';
-
- $form->{attachment_filename} = "USTVA-" . $form->{period}
- . sprintf("%02d", $form->{year} % 100) . ".txb";
-
- $form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
-
- # TODO: set Output to UTF-8 or system Preference
- #$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8");
- #my $iconv = $self->{"iconv"};
- #$iconv->convert($variable);
-
- if ($form->{period} =~ /^[4]\d$/ ){
- my %periods = ( # Lx => taxbird
- '41' => '12',
- '42' => '13',
- '43' => '14',
- '44' => '15',
- );
-
- foreach my $quarter ( keys %periods ) {
- $form->{taxbird_period} = $periods{$quarter} if ( $form->{period} eq $quarter);
+ $form->{IN} = $form->{type} . '.html';
+ $form->{padding} = " ";
+ $form->{bold} = "<b>";
+ $form->{endbold} = "</b>";
+ $form->{br} = "<br>";
+ $form->{address} =~ s/\\n/\n/g;
+
+ foreach my $number (@category_cent) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
}
-
- my %lands = ( # Lx => taxbird # TODO: besser als array...
- 'Baden Würtemberg' => '0',
- 'Bayern' => '1',
- 'Berlin' => '2',
- 'Brandenburg' => '3',
- 'Bremen' => '4',
- 'Hamburg' => '5',
- 'Hessen' => '6',
- 'Mecklenburg Vorpommern' => '7',
- 'Niedersachsen' => '8',
- 'Nordrhein Westfalen' => '9',
- 'Rheinland Pfalz' => '10',
- 'Saarland' => '11',
- 'Sachsen' => '12',
- 'Sachsen Anhalt' => '13',
- 'Schleswig Holstein' => '14',
- 'Thüringen' => '15',
- );
-
- foreach my $land ( keys %lands ){
- $form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land );
+
+ foreach my $number (@category_euro) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0');
}
-
- $form->{co_zip} = $form->{co_city};
- $form->{co_zip} =~ s/\D//g;
- $form->{co_city} =~ s/\d//g;
- $form->{co_city} =~ s/^\s//g;
-
+
+ } 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
+ $file .= $form->{elsterFFFF};
+ $file .= $form->{elstersteuernummer};
+ #file suffix
+ $file .= '.xml';
+ $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', '') : '';
+ }
+
+ 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->{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',
+ '42' => '13',
+ '43' => '14',
+ '44' => '15',
+ );
+
+ foreach my $quarter ( keys %periods ) {
+ $form->{taxbird_period} = $periods{$quarter} if ( $form->{period} eq $quarter);
+ }
+ } elsif ($form->{period} =~ /^\d+$/ ) {
+ $form->{period} =~ s/^0//g;
+ my $period = $form->{period};
+ $period *= 1;
+ $period--;
+ $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
-
+ # $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;
-
- } elsif ($form->{period} =~ /^\d+$/ ) {
- $form->{period} =~ s/^0//g;
- my $period = $form->{period};
- $period * 1;
- $period--;
- $form->{period} = $period;
- } else {
+
+ # 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('Wrong Period' ));
- exit(0);
+ USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
+ ::end_of_request();
}
-
- } elsif ( $form->{format} eq '' ){ # No format error.
- $form->header;
- USTVA::error( $locale->text('Application Error. No Format given' ) . "!");
- exit(0);
-
- } else { # All other Formats are wrong
- $form->header;
- USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
- exit(0);
+
+
+ } 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') {
'Yearly taxreport not yet implemented')
. '!');
}
-
+
$form->{templates} = $myconfig{templates};
$form->{templates} = "doc" if ( $form->{type} eq 'help' );
- $form->parse_template(\%myconfig, $userspath);
+ if ($form->{format} eq 'generic'){
+
+ $form->header();
+
+ my $template_ref = {
+ taxnumber => $myconfig{taxnumber},
+ };
+
+ print($form->parse_html_template('ustva/generic_taxreport', $template_ref));
- $lxdebug->leave_sub();
+ } else
+ {
+
+ $form->parse_template(\%myconfig, $::lx_office_conf{paths}{userspath});
+
+ }
+
+ $::lxdebug->leave_sub();
}
sub config_step1 {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
+
+$::form->{title} = $::locale->text('Tax Office Preferences');
# edit all taxauthority prefs
- $form->header;
- &get_config($userspath, 'finanzamt.ini');
+ $::form->header;
- my $land = $form->{elsterland};
- my $amt = $form->{elsterFFFF};
+ my $ustva = USTVA->new();
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
+ my $land = $::form->{elsterland};
+ my $amt = $::form->{elsterFFFF};
- if ($form->{cbscript} ne '' and $form->{cblogin} ne '') {
- $callback = qq|$form->{cbscript}|
- .qq|?action="config_step1"|
- .qq|&login="$form->{cblogin}"|
- .qq|&path="$form->{cbpath}"|
- .qq|&root="$form->{cbroot}"|
- .qq|&rpw="$form->{cbrpw}"|;
- }
- $form->{title} = $locale->text('Tax Office Preferences');
+ $::form->{title} = $::locale->text('Tax Office Preferences');
- my $select_tax_office = USTVA->fa_auswahl($land, $amt, &elster_hash());
- my $checked_accrual = q|checked="checked"| if ($form->{method} eq 'accrual');
- my $checked_cash = q|checked="checked"| if ($form->{method} eq 'cash');
- my $checked_monthly = "checked" if ($form->{FA_voranmeld} eq 'month');
- my $checked_quarterly = "checked" if ($form->{FA_voranmeld} eq 'quarter');
- my $checked_dauerfristverlaengerung = "checked" if ($form->{FA_dauerfrist} eq '1');
- my $checked_kz_71 = "checked" if ($form->{FA_71} eq 'X');
+ my $select_tax_office = $ustva->fa_auswahl($land, $amt, $ustva->query_finanzamt(\%::myconfig, $::form));
+ my $checked_accrual = q|checked="checked"| if ($::form->{method} eq 'accrual');
+ my $checked_cash = q|checked="checked"| if ($::form->{method} eq 'cash');
+ my $checked_monthly = "checked" if ($::form->{FA_voranmeld} eq 'month');
+ my $checked_quarterly = "checked" if ($::form->{FA_voranmeld} eq 'quarter');
+ my $checked_dauerfristverlaengerung = "checked" if ($::form->{FA_dauerfrist} eq '1');
+ my $checked_kz_71 = "checked" if ($::form->{FA_71} eq 'X');
my $_hidden_variables_ref;
- my %_hidden_local_variables = (
- 'saved' => $locale->text('Check Details'),
+ my %_hidden_local_variables = (
+ 'saved' => $::locale->text('Check Details'),
'nextsub' => 'config_step2',
'warnung' => '0',
);
foreach my $variable (keys %_hidden_local_variables) {
- push @{ $_hidden_variables_ref },
+ push @{ $_hidden_variables_ref },
{ 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
}
my @_hidden_form_variables = qw(
- FA_Name FA_Strasse FA_PLZ
- FA_Ort FA_Telefon FA_Fax
- FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach
- FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1
+ FA_Name FA_Strasse FA_PLZ
+ FA_Ort FA_Telefon FA_Fax
+ FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach
+ FA_BLZ_1 FA_Kontonummer_1 FA_Bankbezeichnung_1
FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich
FA_Oeffnungszeiten FA_Email FA_Internet
steuernummer elsterland elstersteuernummer
- elsterFFFF path login
- password
+ elsterFFFF
);
foreach my $variable (@_hidden_form_variables) {
- push @{ $_hidden_variables_ref},
- { 'variable' => $variable, 'value' => $form->{$variable} };
+ push @{ $_hidden_variables_ref},
+ { 'variable' => $variable, 'value' => $::form->{$variable} };
}
- # hä? kann die weg?
+# Which COA is in use?
+
+ $ustva->get_coa($::form, \%::myconfig);
+
+ # hä? kann die weg?
my $steuernummer_new = '';
- # Variablen für das Template zur Verfügung stellen
+ # Variablen für das Template zur Verfügung stellen
my $template_ref = {
select_tax_office => $select_tax_office,
checked_accrual => $checked_accrual,
checked_quarterly => $checked_quarterly,
checked_dauerfristverlaengerung => $checked_dauerfristverlaengerung,
hidden_variables => $_hidden_variables_ref,
-
+
};
-
+
# Ausgabe des Templates
- print($form->parse_html_template('ustva/config_step1', $template_ref));
+ print($::form->parse_html_template('ustva/config_step1', $template_ref));
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub config_step2 {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
+
+ $::auth->assert('advance_turnover_tax_return');
+
$form->header();
# print qq|
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 = %$elster_init;
if ($change eq '1') {
- # Daten ändern
+ # Daten ändern
$elsterland = $form->{elsterland_new};
$elsterFFFF = $form->{elsterFFFF_new};
$form->{elsterland} = $elsterland;
$form->{elsterFFFF} = $elsterFFFF;
$form->{steuernummer} = '';
-
+
create_steuernummer();
# rebuild elster_amt
my $patterncount = $form->{patterncount};
my $elster_pattern = $form->{elster_pattern};
my $delimiter = $form->{delimiter};
- my $steuernummer = $form->{steuernummer} if ($steuernummer eq '');
+ my $steuernummer = $form->{steuernummer} if ($stnr eq '');
$form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
-
-
- my $input_steuernummer = USTVA->steuernummer_input(
- $form->{elsterland},
+
+ $ustva->get_coa($form, \%myconfig);
+
+ my $input_steuernummer = $ustva->steuernummer_input(
+ $form->{elsterland},
$form->{elsterFFFF},
$form->{steuernummer}
);
- $lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|);
-
+ $::lxdebug->message(LXDebug->DEBUG1, qq|$input_steuernummer|);
+
my $_hidden_variables_ref;
my %_hidden_local_variables = (
'elsterland' => $elsterland,
'elsterFFFF' => $elsterFFFF,
- 'warnung' => $warnung,
+ 'warnung' => 0,
'elstersteuernummer' => $elstersteuernummer,
'steuernummer' => $stnr,
'lastsub' => 'config_step1',
'nextsub' => 'save',
-
+
);
-
+
foreach my $variable (keys %_hidden_local_variables) {
- push @{ $_hidden_variables_ref },
+ push @{ $_hidden_variables_ref },
{ 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
}
-
+
my @_hidden_form_variables = qw(
- FA_steuerberater_name FA_steuerberater_street
+ FA_steuerberater_name FA_steuerberater_street
FA_steuerberater_city FA_steuerberater_tel
FA_voranmeld method
- FA_dauerfrist FA_71
- elster path
- login password
- type elster_init
+ FA_dauerfrist FA_71
+ elster
+ type elster_init
saved callback
);
-
-
foreach my $variable (@_hidden_form_variables) {
- push @{ $_hidden_variables_ref},
+ push @{ $_hidden_variables_ref},
{ 'variable' => $variable, 'value' => $form->{$variable} };
}
my $template_ref = {
- tax_office_data => $tax_office_data,
input_steuernummer => $input_steuernummer,
readonly => '', #q|disabled="disabled"|,
- callback => $callback,
+ callback => $form->{callback},
hidden_variables => $_hidden_variables_ref,
};
-
+
# Ausgabe des Templates
print($form->parse_html_template('ustva/config_step2', $template_ref));
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub create_steuernummer {
- $lxdebug->enter_sub();
- my $part = $form->{part};
- my $patterncount = $form->{patterncount};
- my $delimiter = $form->{delimiter};
- my $elster_pattern = $form->{elster_pattern};
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
+
+ my $part = $::form->{part};
+ my $patterncount = $::form->{patterncount};
+ my $delimiter = $::form->{delimiter};
+ my $elster_pattern = $::form->{elster_pattern};
# rebuild steuernummer and elstersteuernummer
# es gibt eine gespeicherte steuernummer $form->{steuernummer}
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;
-
- $form->{$key} = "$value";
-
- }
- close FACONF;
+sub save {
+ $::lxdebug->enter_sub();
- $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();
# Textboxen formatieren: Linebreaks entfernen
#
- $form->{FA_Oeffnungszeiten} =~ s/\r\n/\\n/g;
+ $::form->{FA_Oeffnungszeiten} =~ s/\r\n/\\n/g;
#URL mit http:// davor?
- $form->{FA_Internet} =~ s/^http:\/\///;
- $form->{FA_Internet} = 'http://' . $form->{FA_Internet};
+ $::form->{FA_Internet} =~ s/^http:\/\///;
+ $::form->{FA_Internet} = 'http://' . $::form->{FA_Internet};
my @config = qw(
elster elsterland elstersteuernummer steuernummer
elsteramt elsterFFFF FA_Name FA_Strasse
- FA_PLZ FA_Ort FA_Telefon FA_Fax
- FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach FA_BLZ_1
+ FA_PLZ FA_Ort FA_Telefon FA_Fax
+ FA_PLZ_Grosskunden FA_PLZ_Postfach FA_Postfach FA_BLZ_1
FA_Kontonummer_1 FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2
FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten
FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name
FA_steuerberater_street FA_steuerberater_city FA_steuerberater_tel
FA_71 FA_dauerfrist);
- # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
- if ($form->{elstersteuernummer} ne '000000000') {
- $form->{elster} = '1';
- open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
+ # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
+ if ($::form->{elstersteuernummer} ne '000000000') {
+
+ $::form->{elster} = '1';
+
+ open my $ustvaconfig, ">", "$::lx_office_conf{paths}{userspath}/$filename" or $::form->error("$filename : $!");
# create the config file
- print CONF qq|# Configuration file for USTVA\n\n|;
+ print {$ustvaconfig} qq|# Configuration file for USTVA\n\n|;
my $key = '';
foreach $key (sort @config) {
- $form->{$key} =~ s/\\/\\\\/g;
+ $::form->{$key} =~ s/\\/\\\\/g;
# strip M
- $form->{$key} =~ s/\r\n/\n/g;
+ $::form->{$key} =~ s/\r\n/\n/g;
- print CONF qq|$key=|;
- if ($form->{$key} ne 'Y') {
- print CONF qq|$form->{$key}\n|;
+ print {$ustvaconfig} qq|$key=|;
+ if ($::form->{$key} ne 'Y') {
+ print {$ustvaconfig} qq|$::form->{$key}\n|;
}
- if ($form->{$key} eq 'Y') {
- print CONF qq|checked \n|;
+ if ($::form->{$key} eq 'Y') {
+ print {$ustvaconfig} qq|checked \n|;
}
}
- print CONF qq|\n\n|;
- close CONF;
- $form->{saved} = $locale->text('saved');
+ print {$ustvaconfig} qq|\n\n|;
+ close $ustvaconfig;
+ $::form->{saved} = $::locale->text('saved');
} else {
- $form->{saved} = $locale->text('Choose a Tax Number');
+ $::form->{saved} = $::locale->text('Choose a Tax Number');
}
config_step2();
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub continue {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
# allow Symbolic references just here:
- no strict 'refs';
- &{ $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();
-}
-
-sub elster_hash {
- $lxdebug->enter_sub();
- my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form);
- $lxdebug->leave_sub();
- return $finanzamt;
+ $::lxdebug->enter_sub();
+ call_sub($::form->{"lastsub"});
+ $::lxdebug->leave_sub();
}
-
projects / kivitendo-erp.git / blobdiff