diff --git a/application/controllers/monfin2/Monfin2overzicht.php b/application/controllers/monfin2/Monfin2overzicht.php
index 5494df4..21107d8 100644
--- a/application/controllers/monfin2/Monfin2overzicht.php
+++ b/application/controllers/monfin2/Monfin2overzicht.php
@@ -560,16 +560,31 @@ class  Monfin2overzicht extends MY_Controller{
 		$orgbestedingen['formSom']	 = '';
 
 		$bestemmingenOrgZelf = $this->Finbestemmingen_model->getsompersoortoverorgs($orgid, $kalenderjaarnr);
+        $soort = $this->Organisaties_model->get_fieldvalue(['id' => $orgid], 'soort');
+
+
+
+
 
 		if ($bestemmingenOrgZelf){
 			foreach($bestemmingenOrgZelf as $besteding){
 				switch ($besteding->categorie){
-					case "BASIS": 	$orgbestedingen['basis']	= $besteding->bedrag;
-									$orgbestedingen['formBasis']	= number_format($besteding->bedrag,0, ',' , '.' );
+//                    25 sept tijdelijk oplossing, uiteindelijk wijzigen in eigen budget en uitgaven en uitgaven voor onder orgs
+					case "BASIS":
+//                        $orgbestedingen['basis']	=  $besteding->bedrag;
+//                        $orgbestedingen['basis']	= $besteding->bedrag;
+                        $orgbestedingen['basis']	= intval($soort)== 3 ?$besteding->bedrag: 0;
+//									$orgbestedingen['formBasis']	= number_format($besteding->bedrag,0, ',' , '.' );
+                        $orgbestedingen['formBasis']	= intval($soort)== 3? number_format($besteding->bedrag,0, ',' , '.' ): 0;
 									break;
-					case "EXTRA": 	$orgbestedingen['extra']	= $besteding->bedrag;
-									$orgbestedingen['formExtra']	=  number_format($besteding->bedrag,0, ',' , '.' );
-									break;		
+					case "EXTRA":
+//                        $orgbestedingen['extra']	= $besteding->bedrag;
+//									$orgbestedingen['formExtra']	=  number_format($besteding->bedrag,0, ',' , '.' );
+                        $orgbestedingen['extra']	=  intval($soort)== 3 ?$besteding->bedrag: 0;
+                        $orgbestedingen['formExtra']	=   intval($soort)== 3? number_format($besteding->bedrag,0, ',' , '.' ): 0;
+
+
+                        break;
 				};// switch
 				$orgbestedingen['som']  += $besteding->bedrag;				
 			}; // foreach bestedingen
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 8b6e49e..c2dc485 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -85,7 +85,8 @@ class MY_Controller extends CI_Controller{
 //    public $version = '1.20.03';// monfin met budgetten
 //    public $version = '1.20.04';// monfin met budgetten update
 //    public $version = '1.20.07';// monfin met budgetten update hogere kalenderjaren
-    public $version = '1.20.11';// stappenplan
+//    public $version = '1.20.11';// stappenplan
+    public $version = '1.20.12';// monfin dubbeltellingen
     public $partituurid;
 	public $globProfielVersieID = 1;
 	public $userid;  		//id of the user that is logged in
diff --git a/application/models/monfin2/Finbestemmingen_model.php b/application/models/monfin2/Finbestemmingen_model.php
index 9fdb9aa..dd7f56c 100644
--- a/application/models/monfin2/Finbestemmingen_model.php
+++ b/application/models/monfin2/Finbestemmingen_model.php
@@ -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();
 	}
diff --git a/application/views/monpas/pages/monfin2/overorgs.php b/application/views/monpas/pages/monfin2/overorgs.php
index 419a65a..5885d97 100644
--- a/application/views/monpas/pages/monfin2/overorgs.php
+++ b/application/views/monpas/pages/monfin2/overorgs.php
@@ -20,23 +20,31 @@
 		</tr>
 	</tbody>
 	<tr style="background-color: #e7e2e5 ; font-style:italic" data-bind="with: subTot">
-			<td>Subtotaal</td>
+<!--        data-bind verwijderen als alles goed staat en wijzigen in subtotaal-->
+			<td data-bind="text: $root.selectedOrg().soort > 2 ? 'Subtotaal' : 'Totaal' "></td>
 			<td style="text-align:right; " data-bind="text: basis"></td>
 			<td style="text-align:right; " data-bind="text: extra"></td>
 			<td style="border-left:1px solid #777777;text-align:right; " data-bind="text: som"></td>
 			<td style="text-align:right; " data-bind="text: budget"></td>
 			<td style="text-align:right; " data-bind="text: verschil"></td>
+<!--        <td style="text-align:right; " data-bind="text: $root.selectedOrg().soort"></td>-->
 	</tr>
-	
-	<tr data-bind="with:targetOrg">
-		<td data-bind="text:naamkort"></td>
-		<td style="text-align:right; " data-bind="text:	bestemmingen.formBasis"></td>
-		<td style="text-align:right;" data-bind="text: bestemmingen.formExtra"></td>
-		<td style="border-left:1px solid #777777;text-align:right;" data-bind="text: bestemmingen.formSom"></td>
-		<td style="text-align:right;" data-bind="text:budgetten.totaal">Totaal budget</td>
-		<td style="text-align:right; " data-bind="text: budgetten.verschil">Verschil</td>
+
+	<tr data-bind="with: targetOrg">
+		<td data-bind="text:  soort == 3 ? naamkort : ''"></td>
+		<td style="text-align:right; " data-bind="text:	soort == 3 ?bestemmingen.formBasis : '' "></td>
+		<td style="text-align:right;" data-bind="text: soort == 3 ? bestemmingen.formExtra: '' "></td>
+		<td style="border-left:1px solid #777777;text-align:right;" data-bind="text: soort == 3 ? bestemmingen.formSom: '' "></td>
+		<td style="text-align:right;" data-bind="text: soort == 3 ? budgetten.totaal: ''"></td>
+		<td style="text-align:right; " data-bind="text: soort == 3 ? budgetten.verschil: ''"></td>
 	</tr>
-	<tr style="background-color: #ded0d7; font-weight: 600" data-bind="with: grandTot">
+
+
+<!-- ko if: targetOrg-->
+ <!-- ko if: targetOrg().soort -->
+    <!-- ko if: targetOrg().soort  == 3 -->
+
+    <tr style="background-color: #ded0d7; font-weight: 600" data-bind="with: grandTot">
 			<td >Totaal</td>
 			<td style="text-align:right; " data-bind="text: basis"></td>
 			<td style="text-align:right;" data-bind="text: extra"></td>
@@ -44,4 +52,13 @@
 			<td style="text-align:right;" data-bind="text: budget"></td>
 			<td style="text-align:right; " data-bind="text: verschil"></td>
 	</tr>
+
+<!-- /ko -->
+<!-- /ko -->
+<!-- /ko -->
+
+
+
+
+
 </table>
diff --git a/application/views/monpas/pages/monfin2/overzicht.php b/application/views/monpas/pages/monfin2/overzicht.php
index 1a67e14..77cb25c 100644
--- a/application/views/monpas/pages/monfin2/overzicht.php
+++ b/application/views/monpas/pages/monfin2/overzicht.php
@@ -335,7 +335,7 @@
                         <!-- /ko -->
                         <td style="text-align:right" >0,00</td>
                         <!-- /ko -->
-                        <td style="text-align:right" data-bind="text:  $root.budgetten() ? $root.schooltotaal().budget : '0,00'">
+                        <td style="text-align:right" data-bind="text:  $root.schooltotaal().budget">
                         </td>
                         <td ><i class="fa fa-info-circle"
                                 data-bind="visible: $root.schooltotaal().budget > 0,
@@ -350,8 +350,12 @@
                             data-bind="text: $root.budgetten() &&parseFloat($root.budgetten().totbedragbudgetkaal) > 0 ? $root.budgetten().totbedragbudgetpct : '0,00' ,
                                                 style: {color:  parseFloat($root.budgetten().totbedragbudgetkaal) > 100 ? 'red' : 'black'}" >
                         </td>
-                        <td  style="text-align:right"
-                             data-bind="text:  $root.budgetten() ? $root.budgetten().totbudgetpct: '0,00' ">
+                        <td
+
+                                style="text-align:right"
+                             data-bind="text:   $root.budgetten().totbudgetpct "
+
+                        >
                         </td>
 
                     </tr>
diff --git a/public/js/monpas/models/monfin2/monfinoverzicht2.js b/public/js/monpas/models/monfin2/monfinoverzicht2.js
index a32d325..75ae32b 100644
--- a/public/js/monpas/models/monfin2/monfinoverzicht2.js
+++ b/public/js/monpas/models/monfin2/monfinoverzicht2.js
@@ -141,6 +141,8 @@ ls.initMonfinOverzicht2Model = function(){
 							self.subTot(result.subtot);
 							self.grandTot(result.grandtot);
 							self.targetOrg(result.targetorg);
+
+
 						},'json');
 					} else if ( self.zelfjanee() ==3){
 						var sd={orgid			: self.selectedOrg().id,