From: G. Richardson Date: Mon, 3 Nov 2014 22:57:55 +0000 (+0100) Subject: USTVA - Position 67 richtig berechnen X-Git-Tag: release-3.2.0beta~192 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8430a44d0e84ec2608f03b361b96cb1786d8e5c7;p=kivitendo-erp.git USTVA - Position 67 richtig berechnen --- diff --git a/SL/USTVA.pm b/SL/USTVA.pm index 6daa01301..b467b427d 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -762,7 +762,7 @@ sub ustva { $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"}; @@ -806,7 +806,7 @@ sub get_accounts_ustva { my $arwhere = ""; my $item; - 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))"; + 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') {