X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fustva.pl;h=22ba04c5c6cf0c1c38c617478780196a343135b8;hb=4ea30430310b49dac2c5a02dfeb3ec0f88f9cdee;hp=99538068444e703d3edad912c0944e7dfd9b61e6;hpb=470a8fa1710b22e2b381eef4cacb01bebaeff725;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 995380684..22ba04c5c 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -1,5 +1,5 @@
#=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
#
# Author: Udo Spallek
@@ -23,6 +23,7 @@
# German Tax authority Module and later ELSTER Interface
#======================================================================
+use strict;
use utf8;
require "bin/mozilla/common.pl";
@@ -37,6 +38,7 @@ require "bin/mozilla/common.pl";
use List::Util qw(first);
+use SL::DB::Default;
use SL::PE;
use SL::RP;
use SL::USTVA;
@@ -82,6 +84,7 @@ sub report {
$::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
@@ -94,24 +97,25 @@ sub report {
# Einlesen der Finanzamtdaten
my $ustva = USTVA->new();
- $ustva->get_config($::userspath, 'finanzamt.ini');
+ $ustva->get_config($::lx_office_conf{paths}{userspath}, 'finanzamt.ini');
# Hier Einlesen der user-config
# 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/
/g;
@@ -198,7 +202,7 @@ sub report {
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,
@@ -224,14 +228,12 @@ sub help {
$::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();
}
@@ -502,7 +504,7 @@ sub show_options {
qq| |;
- if ($::latex_templates) {
+ if ($::lx_office_conf{print_templates}{latex}) {
$format .=
qq|