projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Neue Variable p_discount = Rabattprozente pro Position fuer Rechnungen, Auftraege...
[kivitendo-erp.git]
/
SL
/
RC.pm
diff --git
a/SL/RC.pm
b/SL/RC.pm
index
f9e7891
..
63a41f4
100644
(file)
--- a/
SL/RC.pm
+++ b/
SL/RC.pm
@@
-117,11
+117,11
@@
sub payment_transactions {
$query .= " AND ac.transdate <= '$form->{todate}'" if $form->{todate};
$query .= qq|
$query .= " AND ac.transdate <= '$form->{todate}'" if $form->{todate};
$query .= qq|
-
+
UNION
SELECT v.name, ac.source, ac.transdate, ac.cleared,
ac.fx_transaction, ac.amount, a.id,
UNION
SELECT v.name, ac.source, ac.transdate, ac.cleared,
ac.fx_transaction, ac.amount, a.id,
- $oid{$myconfig->{dbdriver}} AS oid
+ $oid{$myconfig->{dbdriver}} AS oid
FROM vendor v, acc_trans ac, ap a, chart ch
WHERE v.id = a.vendor_id
-- AND NOT ac.fx_transaction
FROM vendor v, acc_trans ac, ap a, chart ch
WHERE v.id = a.vendor_id
-- AND NOT ac.fx_transaction
@@
-135,11
+135,11
@@
sub payment_transactions {
$query .= " AND ac.transdate <= '$form->{todate}'" if $form->{todate};
$query .= qq|
$query .= " AND ac.transdate <= '$form->{todate}'" if $form->{todate};
$query .= qq|
-
+
UNION
SELECT g.description, ac.source, ac.transdate, ac.cleared,
ac.fx_transaction, ac.amount, g.id,
UNION
SELECT g.description, ac.source, ac.transdate, ac.cleared,
ac.fx_transaction, ac.amount, g.id,
- $oid{$myconfig->{dbdriver}} AS oid
+ $oid{$myconfig->{dbdriver}} AS oid
FROM gl g, acc_trans ac, chart ch
WHERE g.id = ac.trans_id
-- AND NOT ac.fx_transaction
FROM gl g, acc_trans ac, chart ch
WHERE g.id = ac.trans_id
-- AND NOT ac.fx_transaction
@@
-201,4
+201,3
@@
sub reconcile {
}
1;
}
1;
-