Merge branch 'feature/budgetmonfin' into develop

# Conflicts: # application/core/MY_Controller.php
2023-09-25 17:03:51 +02:00
parent dacaa93f35 18b363af71
commit 4934f35619
6 changed files with 59 additions and 19 deletions
@@ -263,6 +263,7 @@ class Finbestemmingen_model extends MY_Model{
 					JOIN	finsoorten    	FS on FS.id = FSS.finsoort_id
 					WHERE FB.organisatie_id		in ({$orgids})
 					AND 	FB.kalenderjaar	= {$jaarnr}
+					AND     FB.uitgavetype = 'TOTAAL'
 					GROUP BY categorie, organisatie_id";
 		return $this->get_query_result();
 	}