From: Sven Schöling Date: Wed, 15 Feb 2012 09:43:42 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-2.7.0beta2~5^2~1 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/751544801b2002ff8d31ad17ba329469adbdd71c?hp=97c41afff2c538e47b4bf3b8152278dfa3f19e3d Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/RP.pm b/SL/RP.pm index 072c54bd4..4157d45cd 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -213,7 +213,7 @@ sub get_accounts { # if l_ob is selected l_cb is always ignored if ( $form->{l_ob} ) { - $where .= ' AND ac.ob_transaction is true ' + $where .= ' AND ac.ob_transaction is true ' } elsif ( not $form->{l_cb} ) { $where .= ' AND ac.cb_transaction is false '; }; @@ -1237,7 +1237,7 @@ sub aging { WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null)) AND NOT COALESCE (${arap}.storno, 'f') AND (${arap}.${ct}_id = ${ct}.id) - $where_dpt + $where_dpt AND (${ct}.id = ?) AND (transdate <= (date $todate) $fromwhere ) $review_of_aging_list