projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typos in Filtered Doku
[kivitendo-erp.git]
/
SL
/
USTVA.pm
diff --git
a/SL/USTVA.pm
b/SL/USTVA.pm
index
72bf0b1
..
b467b42
100644
(file)
--- a/
SL/USTVA.pm
+++ b/
SL/USTVA.pm
@@
-759,10
+759,10
@@
sub ustva {
$form->{"Z45"} = $form->{"Z43"};
$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->{"85"} + $form->{"65"};
- $form->{"Z62"} = $form->{"Z
4
3"} - $form->{"66"} - $form->{"61"}
+ $form->{"Z62"} = $form->{"Z
5
3"} - $form->{"66"} - $form->{"61"}
- $form->{"62"} - $form->{"67"} - $form->{"63"}
- $form->{"64"} - $form->{"59"};
- $form->{"62"} - $form->{"67"} - $form->{"63"}
- $form->{"64"} - $form->{"59"};
@@
-806,7
+806,7
@@
sub get_accounts_ustva {
my $arwhere = "";
my $item;
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') {
if ($fromdate) {
if ($form->{method} eq 'cash') {