X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/fa45de43235dd040e7d64fb20819778f4dc5c27c..fbb6027e3c92e049a2e7bddb19a6fc40e4e5312c:/SL/USTVA.pm diff --git a/SL/USTVA.pm b/SL/USTVA.pm index 72bf0b16e..6daa01301 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -759,7 +759,7 @@ sub ustva { $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"} @@ -806,7 +806,7 @@ sub get_accounts_ustva { 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<=66) or (tk.pos_ustva>=89 AND tk.pos_ustva<=93))"; if ($fromdate) { if ($form->{method} eq 'cash') {