Fixes to per-transaction separation of duties

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2155 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 4 insertions, 1 deletions

diff --git a/LedgerSMB/RP.pm b/LedgerSMB/RP.pm
index 9c937bf6..1a236ea8 100644
--- a/LedgerSMB/RP.pm
+++ b/LedgerSMB/RP.pm
@@ -2307,7 +2307,9 @@ sub payments {
 					(a.person_id = e.entity_id)
 			LEFT JOIN entity ee ON (e.entity_id = ee.id)
 			          $dpt_join
-			    WHERE ac.chart_id = $ref->{id} $where|;
+			    WHERE ac.chart_id = $ref->{id} 
+			          AND ac.approved AND a.approved
+			          $where|;
 
         if ( $form->{till} ne "" ) {
             $query .= " AND a.invoice = '1' AND NOT a.till IS NULL";
@@ -2337,6 +2339,7 @@ sub payments {
 				  JOIN entity ee ON (e.entity_id = ee.id)
 				       $dpt_join
 				 WHERE ac.chart_id = $ref->{id} $glwhere
+			               AND ac.approved AND g.approved
 				       AND (ac.amount * $ml) > 0
 				 GROUP BY g.description, ac.transdate, 
 			               ac.source, ac.memo, ee.name|;