projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
456a81d
)
Nachtrag zu R704 'Diverse USTVA Bugs geloest'
author
Udo Spallek
<info@wissensvermittlung.com>
Fri, 30 Dec 2005 19:25:38 +0000
(19:25 +0000)
committer
Udo Spallek
<info@wissensvermittlung.com>
Fri, 30 Dec 2005 19:25:38 +0000
(19:25 +0000)
SL/USTVA.pm
patch
|
blob
|
history
diff --git
a/SL/USTVA.pm
b/SL/USTVA.pm
index
4777c35
..
dc2c46f
100644
(file)
--- a/
SL/USTVA.pm
+++ b/
SL/USTVA.pm
@@
-638,6
+638,7
@@
sub get_accounts_ustva {
my $glwhere = "";
my $subwhere = "";
my $ARwhere = "";
my $glwhere = "";
my $subwhere = "";
my $ARwhere = "";
+ my $arwhere = "";
my $item;
if ($fromdate) {
my $item;
if ($fromdate) {
@@
-646,13
+647,13
@@
sub get_accounts_ustva {
$glwhere = " AND ac.transdate >= '$fromdate'";
$ARwhere .= " AND acc.transdate >= '$fromdate'";
$where .= " AND ac.transdate >= '$fromdate'";
$glwhere = " AND ac.transdate >= '$fromdate'";
$ARwhere .= " AND acc.transdate >= '$fromdate'";
$where .= " AND ac.transdate >= '$fromdate'";
+
}
}
if ($todate) {
$where .= " AND ac.transdate <= '$todate'";
$ARwhere .= " AND acc.transdate <= '$todate'";
}
}
if ($todate) {
$where .= " AND ac.transdate <= '$todate'";
$ARwhere .= " AND acc.transdate <= '$todate'";
- $arwhere .= " AND ac.transdate <= '$todate'";
$subwhere .= " AND transdate <= '$todate'";
}
$subwhere .= " AND transdate <= '$todate'";
}
@@
-695,10
+696,11
@@
sub get_accounts_ustva {
c.pos_ustva
FROM acc_trans ac
JOIN chart c ON (c.id = ac.chart_id)
c.pos_ustva
FROM acc_trans ac
JOIN chart c ON (c.id = ac.chart_id)
- JOIN ar ON (ar.id = ac.trans_id)
+
--
JOIN ar ON (ar.id = ac.trans_id)
where
1=1
where
1=1
- $arwhere
+ -- Here no where, please. All Transactions ever should be
+ -- testet if they are paied in the USTVA report period.
GROUP BY c.pos_ustva
UNION
GROUP BY c.pos_ustva
UNION