# Get all positions for taxreport out of the database
# Needs Databaseupdate Pg-upgrade2/USTVA_abstraction.pl
- return unless defined wantarray;
-
my ( $self,
$arg_ref) = @_;
$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