X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=0f26de3f6ab5fe4ebf9a5529bfb0d6858ca206ca;hb=713de5ed35a8a1faea940354254c4e781631c495;hp=daecb8d88af648e8e8847758916dc96a6bf1b273;hpb=a205ed210bf303bff2af7abcedf128c61d957f3a;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index daecb8d88..0f26de3f6 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -1,6 +1,5 @@
-#!/bin/perl
#=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
#
# Author: Udo Spallek
@@ -19,25 +18,25 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
# German Tax authority Module and later ELSTER Interface
+# 08.01.14 ELSTER Interface software (taxbird/winston) removed
#======================================================================
-require "$form->{path}/arap.pl";
+use strict;
+use utf8;
-#use strict;
-#no strict 'refs';
-#use diagnostics;
-#use warnings; # FATAL=> 'all';
-#use vars qw($locale $form %myconfig);
-#our ($myconfig);
-#use CGI::Carp "fatalsToBrowser";
+require "bin/mozilla/common.pl";
-use SL::PE;
+use List::Util qw(first);
+
+use SL::DB::Default;
use SL::RP;
use SL::USTVA;
use SL::User;
+use SL::Locale::String qw(t8);
1;
# this is for our long dates
@@ -68,15 +67,18 @@ use SL::User;
# $locale->text('Nov')
# $locale->text('Dec')
-# $form->parse_html_template('generic/util_hidden_variables');
-
#############################
sub report {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- my $myconfig = \%myconfig;
+ $::auth->assert('advance_turnover_tax_return');
+ my $defaults = SL::DB::Default->get;
$form->{title} = $locale->text('UStVA');
$form->{kz10} = ''; #Berichtigte Anmeldung? Ja =1 Nein=0
@@ -84,64 +86,59 @@ sub report {
0, 4);
my $department = '';
- local $hide = '';
+ my $hide = '';
+
+ setup_ustva_report_action_bar();
$form->header;
# Einlesen der Finanzamtdaten
- &get_config($userspath, 'finanzamt.ini');
+ my $ustva = USTVA->new();
+ $ustva->get_config();
+ $ustva->get_finanzamt();
# 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
+ 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 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;
+ $form->{$_} = $myconfig{$_} for @a;
- my $openings = $form->{FA_Oeffnungszeiten};
+ my $openings = $form->{fa_oeffnungszeiten};
$openings =~ s/\\\\n/
/g;
- my $company_given = ($form->{company} ne '')
+ my $company_given = ($form->{company} ne '')
? qq|$form->{company}
\n|
- : qq|{path}&action=config|
- . qq|&level=Programm--Preferences&login=$form->{login}|
- . qq|&password=$form->{password}>|
+ : qq||
. $locale->text('No Company Name given') . qq|!
|;
# Anpassungen der Variablennamen auf pre 2.1.1 Namen
- # klären, ob $form->{company_street|_address} gesetzt sind
+ # klären, ob $form->{company_street|_address} gesetzt sind
if ($form->{address} ne '') {
my $temp = $form->{address};
- $temp =~ s/\\n/
/;
+ $temp =~ s/\n/
/;
($form->{co_street}, $form->{co_city}) = split("
", $temp);
- $form->{co_city} =~ s/\\n//g;
+ $form->{co_city} =~ s/\n//g;
}
- my $address_given =
- ($form->{co_street} ne ''
- and (
- $form->{co_zip} ne ''
- or $form->{co_city} ne ''
- )
- )
+ my $address_given =
+ ($form->{co_street} && ($form->{co_zip} || $form->{co_city}))
? qq|$form->{co_street}
|
. qq|$form->{co_street1}
|
. qq|$form->{co_zip} $form->{co_city}|
- : qq|{path}&action=config|
- . qq|&level=Programm--Preferences&login=$form->{login}|
- . qq|&password=$form->{password}>|
- . $locale->text('No Company Address given')
+ : qq||
+ . $locale->text('No Company Address given')
. qq|!\n|;
$form->{co_email} = $form->{email} unless $form->{co_email};
@@ -149,18 +146,13 @@ sub report {
$form->{co_fax} = $form->{fax} unless $form->{co_fax};
$form->{co_url} = $form->{urlx} unless $form->{co_url};
- my $taxnumber_given = ($form->{steuernummer} ne '')
- ? qq|$form->{steuernummer}|
- : qq|{login}|
- . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!|
- . qq|
|;
-
+ my $taxnumber_given = ($form->{taxnumber} ne '') ? $form->{taxnumber} : qq|Keine Steuernummer hinterlegt!
|;
+ my $fa_name_given = ($form->{fa_name} ne '') ? $form->{fa_name} : qq|Kein Finanzamt hinterlegt!
|;
my $ustva_vorauswahl = &ustva_vorauswahl();
my @all_years = $form->all_years(\%myconfig);
- my $select_year = qq||;
- } elsif ($form->{FA_voranmeld} eq 'quarter') {
+ } elsif ($form->{fa_voranmeld} eq 'quarter') {
# Vorauswahl bei quartalsweisem Voranmeldungszeitraum
my %liste = ('41' => $locale->text('1. Quarter'),
@@ -385,8 +383,8 @@ sub ustva_vorauswahl {
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');
+ my $dfv = ''; # Offset für Dauerfristverlängerung
+ $dfv = '100' if ($form->{fa_dauerfrist} eq '1');
SWITCH: {
$yymmdd <= ($yy + 110 + $dfv) && do {
@@ -464,25 +462,15 @@ sub ustva_vorauswahl {
}
$select_vorauswahl .= qq||;
}
- $lxdebug->leave_sub();
-
- return $select_vorauswahl;
-}
+ $::lxdebug->leave_sub();
-#sub config {
-# $lxdebug->enter_sub();
-# config_step1();
-# $lxdebug->leave_sub();
-#}
-
-sub debug {
- $lxdebug->enter_sub();
- $form->debug();
- $lxdebug->leave_sub();
+ return $select_vorauswahl;
}
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";
@@ -492,181 +480,51 @@ sub show_options {
my $media = qq| |;
my $format =
qq| |;
- if ($latex_templates) {
- $format .=
- qq| |;
- }
#my $disabled= qq|disabled="disabled"|;
#$disabled='' if ($form->{elster} eq '1' );
- if ($form->{elster} eq '1') {
+ #if ($::form->{elster} eq '1') {
+ if ( 1 ) {
$format .=
- qq||
- . qq||;
+ qq||;
}
- #$format .= qq||;
my $show_options = qq|
$type
$media
+ . $::locale->text('Choose Outputformat') . qq|">$format
|;
- $lxdebug->leave_sub();
-
+ $::lxdebug->leave_sub();
+
return $show_options;
}
sub generate_ustva {
- $lxdebug->enter_sub();
-
- # Aufruf von get_config aus bin/mozilla/ustva.pl zum
- # Einlesen der Finanzamtdaten aus finanzamt.ini
-
- get_config($userspath, 'finanzamt.ini');
+ $::lxdebug->enter_sub();
- # init some form vars
- my @anmeldungszeitraum =
- qw('0401' '0402' '0403' '0404' '0405' '0405' '0406' '0407' '0408' '0409' '0410' '0411' '0412' '0441' '0442' '0443' '0444');
- foreach my $item (@anmeldungszeitraum) {
- $form->{$item} = "";
- }
-
- #forgotten the year --> thisyear
- if ($form->{year} !~ m/^\d\d\d\d$/) {
- $form->{year} = substr(
- $form->datetonum(
- $form->current_date(\%myconfig), \%myconfig
- ),
- 0, 4);
- $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";
- $form->{todate} = "$form->{year}1231";
- }
-
- #Quater reports
- if ($form->{period} eq "41") {
- $form->{fromdate} = "$form->{year}0101";
- $form->{todate} = "$form->{year}0331";
- $form->{'0441'} = "X";
- }
- if ($form->{period} eq "42") {
- $form->{fromdate} = "$form->{year}0401";
- $form->{todate} = "$form->{year}0630";
- $form->{'0442'} = "X";
- }
- if ($form->{period} eq "43") {
- $form->{fromdate} = "$form->{year}0701";
- $form->{todate} = "$form->{year}0930";
- $form->{'0443'} = "X";
- }
- if ($form->{period} eq "44") {
- $form->{fromdate} = "$form->{year}1001";
- $form->{todate} = "$form->{year}1231";
- $form->{'0444'} = "X";
- }
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- #Monthly reports
- SWITCH: {
- $form->{period} eq "01" && do {
- $form->{fromdate} = "$form->{year}0101";
- $form->{todate} = "$form->{year}0131";
- $form->{'0401'} = "X";
- last SWITCH;
- };
- $form->{period} eq "02" && do {
- $form->{fromdate} = "$form->{year}0201";
+ $::auth->assert('advance_turnover_tax_return');
- #this works from 1901 to 2099, 1900 and 2100 fail.
- my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
- $form->{todate} = "$form->{year}02$leap";
- $form->{"0402"} = "X";
- last SWITCH;
- };
- $form->{period} eq "03" && do {
- $form->{fromdate} = "$form->{year}0301";
- $form->{todate} = "$form->{year}0331";
- $form->{"0403"} = "X";
- last SWITCH;
- };
- $form->{period} eq "04" && do {
- $form->{fromdate} = "$form->{year}0401";
- $form->{todate} = "$form->{year}0430";
- $form->{"0404"} = "X";
- last SWITCH;
- };
- $form->{period} eq "05" && do {
- $form->{fromdate} = "$form->{year}0501";
- $form->{todate} = "$form->{year}0531";
- $form->{"0405"} = "X";
- last SWITCH;
- };
- $form->{period} eq "06" && do {
- $form->{fromdate} = "$form->{year}0601";
- $form->{todate} = "$form->{year}0630";
- $form->{"0406"} = "X";
- last SWITCH;
- };
- $form->{period} eq "07" && do {
- $form->{fromdate} = "$form->{year}0701";
- $form->{todate} = "$form->{year}0731";
- $form->{"0407"} = "X";
- last SWITCH;
- };
- $form->{period} eq "08" && do {
- $form->{fromdate} = "$form->{year}0801";
- $form->{todate} = "$form->{year}0831";
- $form->{"0408"} = "X";
- last SWITCH;
- };
- $form->{period} eq "09" && do {
- $form->{fromdate} = "$form->{year}0901";
- $form->{todate} = "$form->{year}0930";
- $form->{"0409"} = "X";
- last SWITCH;
- };
- $form->{period} eq "10" && do {
- $form->{fromdate} = "$form->{year}1001";
- $form->{todate} = "$form->{year}1031";
- $form->{"0410"} = "X";
- last SWITCH;
- };
- $form->{period} eq "11" && do {
- $form->{fromdate} = "$form->{year}1101";
- $form->{todate} = "$form->{year}1130";
- $form->{"0411"} = "X";
- last SWITCH;
- };
- $form->{period} eq "12" && do {
- $form->{fromdate} = "$form->{year}1201";
- $form->{todate} = "$form->{year}1231";
- $form->{"0412"} = "X";
- last SWITCH;
- };
- }
+ my $defaults = SL::DB::Default->get;
+ my $ustva = USTVA->new();
+ $ustva->get_config();
+ $ustva->get_finanzamt();
+ # Setze Anmeldungszeitraum
+ $ustva->set_FromTo(\%$form);
# 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);
@@ -680,13 +538,13 @@ sub generate_ustva {
# if there are any dates construct a where
if ($form->{fromdate} || $form->{todate}) {
- $form->{todate} = $form->current_date($myconfig) unless ($form->{todate});
+ $form->{todate} = $form->current_date(\%myconfig) unless ($form->{todate});
- my $longtodate = $locale->date($myconfig, $form->{todate}, 1, 0, 0);
- my $shorttodate = $locale->date($myconfig, $form->{todate}, 0, 0, 0);
+ my $longtodate = $locale->date(\%myconfig, $form->{todate}, 1, 0, 0);
+ my $shorttodate = $locale->date(\%myconfig, $form->{todate}, 0, 0, 0);
- my $longfromdate = $locale->date($myconfig, $form->{fromdate}, 1, 0, 0);
- my $shortfromdate = $locale->date($myconfig, $form->{fromdate}, 0, 0, 0);
+ my $longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1, 0, 0);
+ my $shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
$form->{this_period} = "$shortfromdate
\n$shorttodate";
$form->{longperiod} =
@@ -718,214 +576,47 @@ sub generate_ustva {
$locale->date(\%myconfig, $form->current_date(\%myconfig), 0, 0, 0);
# setup variables for the form
- my @a = qw(company businessnumber tel fax email
+ my @a = qw(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_fax co_fax1 co_email co_email1 co_url co_url1
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;
+ $form->{$_} = $myconfig{$_} for @a;
+ $form->{$_} = $defaults->$_ for qw(company address co_ustid duns);
if ($form->{address} ne '') {
my $temp = $form->{address};
- $temp =~ s/\\n/
/;
- ($form->{co_street}, $form->{co_city}) = split("
", $temp);
+ $temp =~ s/\n/
/;
+ ($form->{co_street}, $form->{co_city}) = split("
", $temp,2);
$form->{co_city} =~ s/\\n//g;
}
- #
- # Outputformat specific customisation's
- #
-
- 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
- Z43 Z45 Z53 Z62 Z65 Z67);
+ $form->{id} = [];
+ $form->{amount} = [];
- my @category_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93
- 95 94 42 60 45 52 73 84);
+ if ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
- if ( $form->{format} eq 'pdf' or $form->{format} eq 'postscript') {
+ $form->{IN} = $form->{type} . '.html';
+ $form->{padding} = " ";
+ $form->{bold} = "";
+ $form->{endbold} = "";
+ $form->{br} = "
";
+ $form->{address} =~ s/\\n/\n/g;
- $form->{IN} = "$form->{type}-$form->{year}.tex";
- $form->{padding} = "~~";
- $form->{bold} = "\textbf{";
- $form->{endbold} = "}";
- $form->{br} = '\\\\';
-
- # Zahlenformatierung für Latex USTVA Formulare
-
- foreach my $number (@category_euro) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '');
- }
-
- my ${decimal_comma} = ( $myconfig{numberformat} eq '1.000,00'
- or $myconfig{numberformat} eq '1000,00' ) ? ',':'.';
-
- foreach my $number (@category_cent) {
- $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '');
- $form->{$number} =~ s/${decimal_comma}/~~/g;
- }
-
- } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
-
- $form->{IN} = $form->{type} . '.html';
- $form->{padding} = " ";
- $form->{bold} = "";
- $form->{endbold} = "";
- $form->{br} = "
";
- $form->{address} =~ s/\\n/\n/g;
-
- 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');
- }
-
- } 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';
- $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;
-
- }
-
- elsif ( $form->{format} eq 'elstertaxbird' ) {
-
- $form->{IN} = 'taxbird.txb';
-
- $form->{attachment_filename} = "USTVA-" . $form->{period}
- . sprintf("%02d", $form->{year} % 100) . ".txb";
-
- $form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
-
- 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);
- }
-
- 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 (@{$::form->{category_cent}}) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '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;
-
- ($form->{co_phone_prefix}, $form->{co_phone}) = split("-", $form->{tel});
- $form->{co_phone_prefix} =~ s/\s//g;
- $form->{co_phone} =~ s/\s//g;
-
- $form->{taxbird_steuernummer} = $form->{steuernummer};
-# $form->{taxbird_steuernummer} =~ s/\D//g;
- $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
-
- # Numberformatting for Taxbird
-
- my $temp_numberformat = $myconfig{numberformat};
- # Numberformat must be '1000.00' for Taxbird ?!
-
- $myconfig{numberformat} = '1000.00';
-
- foreach my $number (@category_cent) {
- $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
- }
-
- foreach my $number (@category_euro) {
- $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
+
+ foreach my $number (@{$::form->{category_euro}}) {
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '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 {
+ } else { # we have only html
$form->header;
- USTVA::error( $locale->text('Wrong Period' ));
- exit(0);
- }
-
- } 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);
- }
-
+ USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
+ $::dispatcher->end_request;
+ }
if ( $form->{period} eq '13' and $form->{format} ne 'html') {
$form->header;
USTVA::info(
@@ -933,391 +624,342 @@ sub generate_ustva {
'Yearly taxreport not yet implemented')
. '!');
}
-
- $form->{templates} = $myconfig{templates};
- $form->{templates} = "doc" if ( $form->{type} eq 'help' );
- $form->parse_template(\%myconfig, $userspath);
+ # add a prefix for ustva pos numbers, i.e.: 81 -> post_ustva_81
+ $form->{"pos_ustva_$_"} = $form->{$_} for grep { m{^\d+} } keys %{ $form };
+ $form->{title} = $locale->text('Advance turnover tax return');
- $lxdebug->leave_sub();
+ $form->header;
+ print $form->parse_html_template('ustva/ustva');
+
+ $::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');
+ setup_ustva_config_step1_action_bar();
- my $land = $form->{elsterland};
- my $amt = $form->{elsterFFFF};
+ $::form->header;
+ my $ustva = USTVA->new();
+ $ustva->get_config();
+ $ustva->get_finanzamt();
+
+ my $land = $::form->{fa_land_nr};
+ my $amt = $::form->{fa_bufa_nr};
- 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 $method_local = ($::form->{accounting_method} eq 'accrual') ? $::locale->text('accrual')
+ : ($::form->{accounting_method} eq 'cash') ? $::locale->text('cash')
+ : '';
+
+ my $checked_monthly = $::form->{fa_voranmeld} eq 'month' ? "checked" : '';
+ my $checked_quarterly = $::form->{fa_voranmeld} eq 'quarter' ? "checked" : '';
+ my $checked_dauerfristverlaengerung = $::form->{da_dauerfrist} eq '1' ? "checked" : '';
my $_hidden_variables_ref;
- my %_hidden_local_variables = (
- 'saved' => $locale->text('Check Details'),
- 'nextsub' => 'config_step2',
- 'warnung' => '0',
+ my %_hidden_local_variables = (
+ 'saved' => $::locale->text('Check Details'),
);
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_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich
- FA_Oeffnungszeiten FA_Email FA_Internet
- steuernummer elsterland elstersteuernummer
- elsterFFFF path login
- password
- );
+ my @_hidden_form_variables = $ustva->get_fiamt_vars();
+ push @_hidden_form_variables ,qw(fa_bufa_nr taxnumber accounting_method coa);
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?
- my $steuernummer_new = '';
+ $ustva->get_coa($::form); # fetches coa and modifies some form variables
- # 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_cash => $checked_cash,
+ method_local => $method_local,
checked_monthly => $checked_monthly,
checked_quarterly => $checked_quarterly,
checked_dauerfristverlaengerung => $checked_dauerfristverlaengerung,
hidden_variables => $_hidden_variables_ref,
-
+
};
-
+
# Ausgabe des Templates
- print($form->parse_html_template('ustva/config_step1', $template_ref));
+ 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');
+
+ setup_ustva_config_step2_action_bar();
+
$form->header();
-# print qq|
-#
-# |;
+ my $fa_land_nr = '';
+ my $fa_bufa_nr = '';
+
+ my $ustva = USTVA->new();
+ $ustva->get_config() if ($form->{saved} eq $locale->text('saved'));
+ my $coa = $::form->{coa};
+ $form->{"COA_$coa"} = '1';
+ $form->{COA_Germany} = '1' if ($coa =~ m/^germany/i);
+ $ustva->get_finanzamt();
- my $elsterland = '';
- my $elster_amt = '';
- my $elsterFFFF = '';
- my $elstersteuernummer = '';
- &get_config($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'
- || $form->{elsterland_new} eq 'Auswahl');
+ if ( $form->{fa_bufa_nr_new} eq 'Auswahl'
+ || $form->{fa_land_nr_new} eq 'Auswahl');
USTVA::info( $locale->text('Missing Method!') . "\n"
. $locale->text('USTVA-Hint: Method'))
- if ($form->{method} eq '');
+ if ($form->{accounting_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änderungen 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';
+# $::lxdebug->message(LXDebug->DEBUG2,"land old=".$form->{fa_land_nr}." new=".$form->{fa_land_nr_new});
+# $::lxdebug->message(LXDebug->DEBUG2,"bufa old=".$form->{fa_bufa_nr}." new=".$form->{fa_bufa_nr_new});
+ my $change = $form->{fa_land_nr} eq $form->{fa_land_nr_new}
+ && $form->{fa_bufa_nr} eq $form->{fa_bufa_nr_new} ? '0' : '1';
$change = '0' if ($form->{saved} eq $locale->text('saved'));
- my $elster_init = &elster_hash();
- my %elster_init = %$elster_init;
if ($change eq '1') {
- # Daten ändern
- $elsterland = $form->{elsterland_new};
- $elsterFFFF = $form->{elsterFFFF_new};
- $form->{elsterland} = $elsterland;
- $form->{elsterFFFF} = $elsterFFFF;
- $form->{steuernummer} = '';
-
+ # Daten ändern
+ $fa_land_nr = $form->{fa_land_nr_new};
+ $fa_bufa_nr = $form->{fa_bufa_nr_new};
+ $form->{fa_land_nr} = $fa_land_nr;
+ $form->{fa_bufa_nr} = $fa_bufa_nr;
+ $form->{taxnumber} = '';
+
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} });
- }
-
- # 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];
- }
+ $ustva->get_finanzamt();
} else {
- $elsterland = $form->{elsterland};
- $elsterFFFF = $form->{elsterFFFF};
+ $fa_land_nr = $form->{fa_land_nr};
+ $fa_bufa_nr = $form->{fa_bufa_nr};
}
- my $stnr = $form->{steuernummer};
+# $::lxdebug->message(LXDebug->DEBUG2, "form stnr=".$form->{taxnumber}." fa_bufa_nr=".$fa_bufa_nr.
+# " pattern=".$form->{elster_pattern}." fa_land_nr=".$fa_land_nr);
+ my $stnr = $form->{taxnumber};
$stnr =~ s/\D+//g;
- my $patterncount = $form->{patterncount};
- my $elster_pattern = $form->{elster_pattern};
- my $delimiter = $form->{delimiter};
- my $steuernummer = $form->{steuernummer} if ($steuernummer eq '');
-
- $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
-
-
-
- my $input_steuernummer = USTVA->steuernummer_input(
- $form->{elsterland},
- $form->{elsterFFFF},
- $form->{steuernummer}
+ my $taxnumber = $stnr eq '' ? $form->{taxnumber} : '';
+
+ $form->{fa_oeffnungszeiten} =~ s/\\\\n/\n/g;
+
+
+ $ustva->get_coa($form); # fetches coa and modifies some form variables
+
+ my $input_steuernummer = $ustva->steuernummer_input(
+ $fa_land_nr,
+ $fa_bufa_nr,
+ $form->{taxnumber}
);
- $lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|);
-
+# $::lxdebug->message(LXDebug->DEBUG2, qq|$input_steuernummer|);
+
my $_hidden_variables_ref;
my %_hidden_local_variables = (
- 'elsterland' => $elsterland,
- 'elsterFFFF' => $elsterFFFF,
- 'warnung' => $warnung,
- 'elstersteuernummer' => $elstersteuernummer,
- 'steuernummer' => $stnr,
+ 'fa_land_nr' => $fa_land_nr,
+ 'fa_bufa_nr' => $fa_bufa_nr,
+ 'taxnumber' => $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_city FA_steuerberater_tel
- FA_voranmeld method
- FA_dauerfrist FA_71
- elster path
- login password
- type elster_init
- saved callback
+ fa_dauerfrist fa_steuerberater_city fa_steuerberater_name
+ fa_steuerberater_street fa_steuerberater_tel
+ fa_voranmeld fa_dauerfrist
+ accounting_method
+ type
+ saved
);
-
-
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,
+ COA_Germany => $form->{COA_Germany},
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};
-
- # rebuild steuernummer and elstersteuernummer
- # es gibt eine gespeicherte steuernummer $form->{steuernummer}
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
+
+ my $part = $::form->{part};
+ my $patterncount = $::form->{patterncount};
+ my $delimiter = $::form->{delimiter1};
+ my $elster_pattern = $::form->{elster_pattern};
+
+ # rebuild taxnumber
+ # es gibt eine gespeicherte steuernummer $form->{taxnumber}
# und die parts und delimiter
my $h = 0;
my $i = 0;
- my $steuernummer_new = $part;
- my $elstersteuernummer_new = $form->{elster_FFFF};
- $elstersteuernummer_new .= '0';
+ my $taxnumber_new = $part;
for ($h = 1; $h < $patterncount; $h++) {
- $steuernummer_new .= qq|$delimiter|;
+ $delimiter = $::form->{delimiter2} if $h > 1;
+ $taxnumber_new .= qq|$delimiter|;
for (my $i = 1; $i <= length($elster_pattern); $i++) {
- $steuernummer_new .= $form->{"part_$h\_$i"};
- $elstersteuernummer_new .= $form->{"part_$h\_$i"};
+ $taxnumber_new .= $::form->{"part_$h\_$i"};
}
}
- if ($form->{steuernummer} ne $steuernummer_new) {
- $form->{steuernummer} = $steuernummer_new;
- $form->{elstersteuernummer} = $elstersteuernummer_new;
- $form->{steuernummer_new} = $steuernummer_new;
+# $::lxdebug->message(LXDebug->DEBUG2, "oldstnr=".$::form->{taxnumber}." newstnr=".$taxnumber_new);
+ if ($::form->{taxnumber} ne $taxnumber_new) {
+ $::form->{taxnumber} = $taxnumber_new;
+ $::form->{taxnumber_new} = $taxnumber_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/$form->{login}_$filename")
- or #falls Datei nicht vorhanden ist
- sub {
- open(FANEW, ">$userpath/$form->{login}_$filename")
- or $form->error("$userpath/$filename : $!");
- close FANEW;
- open(FACONF, "$userpath/$form->{login}_$filename")
- or $form->error("$userpath/$form->{username}_$filename : $!");
- };
- while () {
- last if /^\[/;
- next if /^(#|\s)/;
-
- # remove comments
- s/\s#.*//g;
-
- # remove any trailing whitespace
- s/^\s*(.*?)\s*$/$1/;
- ($key, $value) = split /=/, $_, 2;
-
- $form->{$key} = "$value";
-
+ $::form->{taxnumber_new} = '';
}
- close FACONF;
-
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub save {
- $lxdebug->enter_sub();
- my $filename = "$form->{login}_$form->{filename}";
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
#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};
-
- my @config = qw(elster elsterland elstersteuernummer steuernummer
- elsteramt elsterFFFF FA_Name FA_Strasse
- FA_PLZ FA_Ort FA_Telefon FA_Fax FA_PLZ_Grosskunden
- FA_PLZ_Postfach FA_Postfach FA_BLZ_1 FA_Kontonummer_1
- FA_Bankbezeichnung_1 FA_BLZ_2 FA_Kontonummer_2
- FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten
- FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name
- FA_steuerberater_street FA_steuerberater_city FA_steuerberater_tel
- FA_71 FA_dauerfrist);
-
- # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
- if ($form->{elstersteuernummer} ne '000000000') {
- $form->{elster} = '1';
- open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
-
- # create the config file
- print CONF qq|# Configuration file for USTVA\n\n|;
- my $key = '';
- foreach $key (sort @config) {
- $form->{$key} =~ s/\\/\\\\/g;
- # strip M
- $form->{$key} =~ s/\r\n/\n/g;
-
- print CONF qq|$key=|;
- if ($form->{$key} ne 'Y') {
- print CONF qq|$form->{$key}\n|;
- }
- if ($form->{$key} eq 'Y') {
- print CONF qq|checked \n|;
- }
- }
- print CONF qq|\n\n|;
- close CONF;
- $form->{saved} = $locale->text('saved');
+ $::form->{fa_internet} =~ s/^http:\/\///;
+ $::form->{fa_internet} = 'http://' . $::form->{fa_internet};
+
+ # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer TODO ??
+ if (1) {
+ my $ustva = USTVA->new();
+ $ustva->save_config();
+
+ #$::form->{elster} = '1';
+ $::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();
+ $::lxdebug->enter_sub();
+ call_sub($::form->{"lastsub"});
+ $::lxdebug->leave_sub();
}
-sub elster_hash {
- $lxdebug->enter_sub();
- my $finanzamt = USTVA->query_finanzamt(\%myconfig, \%$form);
- $lxdebug->leave_sub();
- return $finanzamt;
+sub setup_ustva_report_action_bar {
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Show'),
+ submit => [ '#form_do', { action => 'generate_ustva' } ],
+ accesskey => 'enter',
+ ],
+ action => [
+ t8('Geierlein'),
+ call => [ 'sendGeierlein' ],
+ disabled => !length($::lx_office_conf{paths}{geierlein_path} // '') ? t8('The Geierlein path has not been set in the configuration.') : undef,
+ tooltip => t8('Transfer data to Geierlein ELSTER application'),
+ ],
+ );
+ }
}
+sub setup_ustva_config_step1_action_bar {
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Continue'),
+ submit => [ '#form', { action => 'config_step2' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+sub setup_ustva_config_step2_action_bar {
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Save'),
+ submit => [ '#form', { action => 'save' } ],
+ accesskey => 'enter',
+ ],
+ action => [
+ t8('Back'),
+ call => [ 'kivi.history_back' ],
+ ],
+ );
+ }
+}