X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRC.pm;h=6de28ab65e01ec8be997ab6f74a90f64d4604a63;hb=0f2d4920a798878ab2ff60ba11b190854c23c5fb;hp=f9e789161c5ac91c10882ea2051025d025d77d06;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git diff --git a/SL/RC.pm b/SL/RC.pm index f9e789161..6de28ab65 100644 --- a/SL/RC.pm +++ b/SL/RC.pm @@ -73,7 +73,7 @@ sub payment_transactions { if ($form->{fromdate}) { $query = qq|SELECT sum(a.amount), (SELECT DISTINCT c2.category FROM chart c2 - WHERE c2accno = '$form->{accno}') AS category + WHERE c2.accno = '$form->{accno}') AS category FROM acc_trans a JOIN chart c ON (c.id = a.chart_id) WHERE a.transdate < date '$form->{fromdate}' @@ -117,11 +117,11 @@ sub payment_transactions { $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, - $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 @@ -135,11 +135,11 @@ sub payment_transactions { $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, - $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 @@ -201,4 +201,3 @@ sub reconcile { } 1; -