#=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
# Copyright (c) 2004 by Udo Spallek, Aachen
#
# Author: Udo Spallek
# Get all positions for taxreport out of the database
# Needs Databaseupdate Pg-upgrade2/USTVA_abstraction.pl
- return unless defined wantarray;
-
my ( $self,
$arg_ref) = @_;
my $attribute = $arg_ref->{attribute}; #
my $dec_places = (defined $arg_ref->{dec_places}) ? $arg_ref->{dec_places}:undef;
- my $where_type = "AND tax.report_headings.type = '$type'" if ( $type );
- my $where_dcp = "AND tax.report_variables.dec_places = '$dec_places'" if ( defined $dec_places );
+ my $where_type = $type ? "AND tax.report_headings.type = '$type'" : '';
+ my $where_dcp = defined $dec_places ? "AND tax.report_variables.dec_places = '$dec_places'" : '';
my $query = qq|
SELECT $attribute
my $filename = "sql/$table.sql";
my $tst = $dbh->prepare("SELECT * FROM $table");
- $tst->execute;
- if ($DBI::err) {
-
+ $tst->execute || do {
#There is no table, read the table from sql/finanzamt.sql
print qq|<p>Bitte warten, Tabelle $table wird einmalig in Datenbank:
$myconfig->{dbname} als Benutzer: $myconfig->{dbuser} hinzugefĆ¼gt...</p>|;
#execute second last call
my $dbh = $form->dbconnect($myconfig) or $self->error(DBI->errstr);
$dbh->disconnect();
- }
+ };
$tst->finish();
#$dbh->disconnect();
$form->{"Z45"} = $form->{"Z43"};
- $form->{"Z53"} = $form->{"Z45"} + $form->{"53"} + $form->{"74"}
+ $form->{"Z53"} = $form->{"Z45"} + $form->{"47"} + $form->{"53"} + $form->{"74"}
+ $form->{"85"} + $form->{"65"};
- $form->{"Z62"} = $form->{"Z43"} - $form->{"66"} - $form->{"61"}
+ $form->{"Z62"} = $form->{"Z53"} - $form->{"66"} - $form->{"61"}
- $form->{"62"} - $form->{"67"} - $form->{"63"}
- $form->{"64"} - $form->{"59"};
my $arwhere = "";
my $item;
- my $gltaxkey_where = "(tk.pos_ustva>=59 AND tk.pos_ustva<=66)";
+ my $gltaxkey_where = "((tk.pos_ustva = 46) OR (tk.pos_ustva>=59 AND tk.pos_ustva<=67) or (tk.pos_ustva>=89 AND tk.pos_ustva<=93))";
if ($fromdate) {
if ($form->{method} eq 'cash') {
$form->error("Missing Parameter: @_") if !$userspath || !$filename;
- $filename = "$form->{login}_$filename";
+ $filename = "$::myconfig{login}_$filename";
$filename =~ s|.*/||;
$filename = "$userspath/$filename";
open my $FACONF, "<", $filename or do {# Annon Sub