-#!/bin/perl
#=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
#
# Author: Udo Spallek
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#======================================================================
# German Tax authority Module and later ELSTER Interface
+# 08.01.14 ELSTER Interface software (taxbird/winston) removed
#======================================================================
+use strict;
+use utf8;
+
require "bin/mozilla/common.pl";
#use strict;
#our ($myconfig);
#use CGI::Carp "fatalsToBrowser";
+use List::Util qw(first);
+
+use SL::DB::Default;
use SL::PE;
use SL::RP;
use SL::USTVA;
#############################
sub report {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ 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
0, 4);
my $department = '';
- local $hide = '';
+ my $hide = '';
$form->header;
# Einlesen der Finanzamtdaten
- USTVA->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
+ 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_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_accountnr3
);
- map { $form->{$_} = $myconfig->{$_} } @a;
+ $form->{$_} = $myconfig{$_} for @a;
+ $form->{$_} = $defaults->$_ for qw(company address co_ustid duns);
my $openings = $form->{FA_Oeffnungszeiten};
$openings =~ s/\\\\n/<br>/g;
my $company_given = ($form->{company} ne '')
? qq|<h3>$form->{company}</h3>\n|
- : qq|<a href="am.pl?action=config|
- . qq|&level=Programm--Preferences">|
+ : 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 \/>/;
# Which COA is in use?
- USTVA->get_coa($form, $myconfig);
+ $ustva->get_coa($form); # fetches coa and modifies some form variables
my $template_ref = {
openings => $openings,
company_given => $company_given,
address_given => $address_given,
taxnumber_given => $taxnumber_given,
- taxnumber => $myconfig->{taxnumber},
+ taxnumber => $defaults->taxnumber,
select_year => $select_year,
period_local => $period_local,
method_local => $method_local,
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub help {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::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();
-
- #$form->{templates} = $tmp;
- $lxdebug->leave_sub();
+ $::form->{templates} = 'doc';
+ $::form->{help} = 'ustva';
+ $::form->{type} = 'help';
+ $::form->{format} = 'html';
+ generate_ustva();
+
+ $::lxdebug->leave_sub();
}
sub show {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
#&generate_ustva();
- no strict 'refs';
- $lxdebug->leave_sub();
- call_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');
+ $::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|
+ $::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
$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');
+ $::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('HTML')
. qq|</option>|;
- if ($latex_templates) {
- $format .=
- qq| <option value=pdf>|
- . $locale->text('UStVA (PDF-Dokument)')
- . qq|</option>|;
- }
-
- #my $disabled= qq|disabled="disabled"|;
- #$disabled='' if ($form->{elster} eq '1' );
- if ($form->{elster} eq '1') {
- $format .=
- qq|<option value=elsterwinston>|
- . $locale->text('ELSTER Export (Winston)')
- . qq|</option>|
- . qq|<option value=elstertaxbird>|
- . $locale->text('ELSTER Export (Taxbird)')
- . qq|</option>|;
- }
- #$format .= qq|<option value=elster>|.$locale->text('ELSTER Export nach Winston').qq|</option>|;
my $show_options = qq|
$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');
+ $::auth->assert('advance_turnover_tax_return');
+
+ my $defaults = SL::DB::Default->get;
+ $form->error($::locale->text('No print templates have been created for this client yet. Please do so in the client configuration.')) if !$defaults->templates;
+ $form->{templates} = $defaults->templates;
# Aufruf von get_config zum Einlesen der Finanzamtdaten aus finanzamt.ini
- USTVA->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 =
$form->current_date(\%myconfig), \%myconfig
),
0, 4);
- $lxdebug->message(LXDebug::DEBUG1,
+ $::lxdebug->message(LXDebug->DEBUG1,
qq|Actual year from Database: $form->{year}\n|);
}
};
}
- # Kontrollvariable für die Templates
- $form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0";
-
+ # 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} =
$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};
# Outputformat specific customisation's
#
- my @category_cent = USTVA->report_variables({
+ my @category_cent = $ustva->report_variables({
myconfig => \%myconfig,
form => $form,
type => '',
dec_places => '2',
});
- push @category_cent, qw(83 Z43 Z45 Z53 Z62 Z65 Z67);
+ push @category_cent, qw(Z43 Z45 Z53 Z62 Z65 Z67);
- my @category_euro = USTVA->report_variables({
+ my @category_euro = $ustva->report_variables({
myconfig => \%myconfig,
form => $form,
type => '',
$form->{endbold} = "}";
$form->{br} = '\\\\';
- # Zahlenformatierung für Latex USTVA Formulare
+ # Zahlenformatierung für Latex USTVA Formulare
foreach my $number (@category_euro) {
$form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '');
$form->{$number} =~ s/${decimal_comma}/~~/g;
}
- } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
+ } elsif ( $form->{format} eq 'html') { # Formatierungen für HTML Ausgabe
$form->{IN} = $form->{type} . '.html';
$form->{padding} = " ";
$form->{br} = "<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';
- $file =~ s|.*/||;
- $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;
-
- # 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} = "$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->{period} = $period;
- } else {
- $form->header;
- USTVA::error( $locale->text('Wrong Period' ));
- exit(0);
- }
-
- my %lands = ( # Lx => taxbird # TODO: besser als array...
- 'Baden Würtemberg' => '0',
- 'Bayern' => '1',
- 'Berlin' => '2',
- 'Brandenburg' => '3',
- 'Bremen' => '4',
- 'Hamburg' => '5',
- 'Hessen' => '6',
- 'Mecklenburg Vorpommern' => '7',
- 'Niedersachsen' => '8',
- 'Nordrhein Westfalen' => '9',
- 'Rheinland Pfalz' => '10',
- 'Saarland' => '11',
- 'Sachsen' => '12',
- 'Sachsen Anhalt' => '13',
- 'Schleswig Holstein' => '14',
- 'Thüringen' => '15',
- );
- foreach my $land ( keys %lands ){
- $form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land );
- }
-
- $form->{co_zip} = $form->{co_city};
- $form->{co_zip} =~ s/\D//g;
- $form->{co_city} =~ s/\d//g;
- $form->{co_city} =~ s/^\s//g;
-
- ($form->{co_phone_prefix}, $form->{co_phone}) = split("-", $form->{tel});
- $form->{co_phone_prefix} =~ s/\s//g;
- $form->{co_phone} =~ s/\s//g;
-
- $form->{taxbird_steuernummer} = $form->{steuernummer};
- # $form->{taxbird_steuernummer} =~ s/\D//g;
- $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
-
- # Numberformatting for Taxbird
- my $temp_numberformat = $myconfig{numberformat};
- # Numberformat must be '1000,00' for Taxbird ?!
- $myconfig{numberformat} = '1000,00';
- foreach my $number (@category_cent) {
- $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
}
foreach my $number (@category_euro) {
- $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
- }
- # Re-set Numberformat
- $myconfig{numberformat} = $temp_numberformat;
-
- # push Kennziffern to <%foreach Array fo easyer
- # output in xml format. Thx to Moritz.
- my %taxbird_id_for = (
-
- '511' => 'Kz51-calc',
- '861' => 'Kz86-calc',
- '971' => 'Kz97-calc',
- '931' => 'Kz93-calc',
- '811' => 'Kz81-calc',
- '891' => 'Kz89-calc',
- 'Z45' => 'uebertrag',
- 'Z53' => 'ust-sum',
- 'Z62' => 'ust-minus-vost',
- 'Z65' => 'ust-sum+69',
- 'Z67' => 'ust-vz',
- );
-
-
- for my $kennziffer (@category_cent, @category_euro) {
-
- next if ($kennziffer eq 'Z43');
-
- if ($form->{$kennziffer} != 0){
- if (defined $taxbird_id_for{$kennziffer}) {
- push(@{ $form->{id}}, $taxbird_id_for{$kennziffer});
- } else {
- push(@{ $form->{id}}, "Kz$kennziffer");
- }
- push(@{ $form->{amount}}, $form->{$kennziffer});
- }
+ $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0');
}
-
} elsif ( $form->{format} eq '' ){ # No format error.
$form->header;
USTVA::error( $locale->text('Application Error. No Format given' ) . "!");
- exit(0);
+ ::end_of_request();
} else { # All other Formats are wrong
$form->header;
USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
- exit(0);
+ ::end_of_request();
}
} else # Outputformat for generic output
{
- my @category_cent = USTVA->report_variables({
+ my @category_cent = $ustva->report_variables({
myconfig => \%myconfig,
form => $form,
type => '',
dec_places => '2',
});
- my @category_euro = USTVA->report_variables({
+ my @category_euro = $ustva->report_variables({
myconfig => \%myconfig,
form => $form,
type => '',
$form->{USTVA} = [];
- if ( $form->{format} eq 'generic') { # Formatierungen für HTML Ausgabe
+ if ( $form->{format} eq 'generic') { # Formatierungen für HTML Ausgabe
my $rec_ref = {};
for my $kennziffer (@category_cent, @category_euro) {
$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 );
+ $::lxdebug->message($LXDebug::DEBUG, "Kennziffer $kennziffer: '$form->{$kennziffer}'" );
+ $::lxdebug->dump($LXDebug::DEBUG, $rec_ref );
push @ { $form->{USTVA} }, $rec_ref;
}
. '!');
}
- $form->{templates} = $myconfig{templates};
$form->{templates} = "doc" if ( $form->{type} eq 'help' );
if ($form->{format} eq 'generic'){
$form->header();
- $template_ref = {
- taxnumber => $myconfig{taxnumber},
+ my $template_ref = {
+ taxnumber => $defaults->taxnumber,
};
print($form->parse_html_template('ustva/generic_taxreport', $template_ref));
} else
{
+ # 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');
+
+ $form->header;
+ print $form->parse_html_template('ustva/ustva');
- $form->parse_template(\%myconfig, $userspath);
}
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub config_step1 {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
+
+ $::auth->assert('advance_turnover_tax_return');
- $auth->assert('advance_turnover_tax_return');
+$::form->{title} = $::locale->text('Tax Office Preferences');
# edit all taxauthority prefs
- $form->header;
- USTVA->get_config($userspath, 'finanzamt.ini');
+ $::form->header;
+
+ my $ustva = USTVA->new();
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
- my $land = $form->{elsterland};
- my $amt = $form->{elsterFFFF};
+ my $land = $::form->{elsterland};
+ my $amt = $::form->{elsterFFFF};
- $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 = $::form->{method} eq 'accrual' ? q|checked="checked"| : '';
+ my $checked_cash = $::form->{method} eq 'cash' ? q|checked="checked"| : '';
+ my $checked_monthly = $::form->{FA_voranmeld} eq 'month' ? "checked" : '';
+ my $checked_quarterly = $::form->{FA_voranmeld} eq 'quarter' ? "checked" : '';
+ my $checked_dauerfristverlaengerung = $::form->{FA_dauerfrist} eq '1' ? "checked" : '';
+ my $checked_kz_71 = $::form->{FA_71} eq 'X' ? "checked" : '';
my $_hidden_variables_ref;
my %_hidden_local_variables = (
- 'saved' => $locale->text('Check Details'),
+ 'saved' => $::locale->text('Check Details'),
'nextsub' => 'config_step2',
'warnung' => '0',
);
foreach my $variable (@_hidden_form_variables) {
push @{ $_hidden_variables_ref},
- { 'variable' => $variable, 'value' => $form->{$variable} };
+ { 'variable' => $variable, 'value' => $::form->{$variable} };
}
# Which COA is in use?
- USTVA->get_coa($form, \%myconfig);
+ $ustva->get_coa($::form); # fetches coa and modifies some form variables
- # hä? kann die weg?
+ # 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,
};
# 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();
- $auth->assert('advance_turnover_tax_return');
+ my $form = $::form;
+ my $locale = $::locale;
+ my %myconfig = %::myconfig;
- $form->header();
+ $::auth->assert('advance_turnover_tax_return');
-# print qq|
-# <body>
-# |;
+ $form->header();
my $elsterland = '';
my $elster_amt = '';
my $elsterFFFF = '';
my $elstersteuernummer = '';
- USTVA->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;
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} });
- }
+ my $amt = $elster_init{$elsterFFFF};
# load the predefined hash data into the FA_* Vars
my @variables = qw(FA_Name FA_Strasse FA_PLZ FA_Ort
my $patterncount = $form->{patterncount};
my $elster_pattern = $form->{elster_pattern};
my $delimiter = $form->{delimiter};
- my $steuernummer = $form->{steuernummer} if ($steuernummer eq '');
+ my $steuernummer = $stnr eq '' ? $form->{steuernummer} : '';
$form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
+ $ustva->get_coa($form); # fetches coa and modifies some form variables
- my $input_steuernummer = USTVA->steuernummer_input(
+ 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',
}
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,
};
print($form->parse_html_template('ustva/config_step2', $template_ref));
- $lxdebug->leave_sub();
+ $::lxdebug->leave_sub();
}
sub create_steuernummer {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
- my $part = $form->{part};
- my $patterncount = $form->{patterncount};
- my $delimiter = $form->{delimiter};
- my $elster_pattern = $form->{elster_pattern};
+ 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 save {
- $lxdebug->enter_sub();
+ $::lxdebug->enter_sub();
- $auth->assert('advance_turnover_tax_return');
+ $::auth->assert('advance_turnover_tax_return');
- my $filename = "$form->{login}_$form->{filename}";
+ my $filename = "$::myconfig{login}_$::form->{filename}";
$filename =~ s|.*/||;
#zuerst die steuernummer aus den part, parts_X_Y und delimiter herstellen
# 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
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') {
+ # Hier kommt dann die Plausibilitätsprüfung der ELSTERSteuernummer
+ if ($::form->{elstersteuernummer} ne '000000000') {
- $form->{elster} = '1';
+ $::form->{elster} = '1';
- open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
+ open my $ustvaconfig, ">", "$::lx_office_conf{paths}{userspath}/$filename" or $::form->error("$filename : $!");
# create the config file
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 {$ustvaconfig} qq|$key=|;
- if ($form->{$key} ne 'Y') {
- print {$ustvaconfig} qq|$form->{$key}\n|;
+ if ($::form->{$key} ne 'Y') {
+ print {$ustvaconfig} qq|$::form->{$key}\n|;
}
- if ($form->{$key} eq 'Y') {
+ if ($::form->{$key} eq 'Y') {
print {$ustvaconfig} qq|checked \n|;
}
}
print {$ustvaconfig} qq|\n\n|;
close $ustvaconfig;
- $form->{saved} = $locale->text('saved');
+ $::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';
- call_sub($form->{"nextsub"});
- use strict 'refs';
- $lxdebug->leave_sub();
+ call_sub($::form->{"nextsub"});
+ $::lxdebug->leave_sub();
}
sub back {
- $lxdebug->enter_sub();
- call_sub($form->{"lastsub"});
- $lxdebug->leave_sub();
-}
-
-sub elster_hash {
- $lxdebug->enter_sub();
-
- $auth->assert('advance_turnover_tax_return');
-
- 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