Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	public/css/monpas/main.css
This commit is contained in:
Monique
2024-02-13 23:10:05 +01:00
parent fb692bba7d f4203f187e
commit 0c1f892b36
12 changed files with 463 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monfin2/Finbestemmingen_model.php
+2 -2
View File
@@ -263,7 +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'
AND FB.uitgavetype <> 'TOTAAL'
GROUP BY categorie, organisatie_id";
return $this->get_query_result();
}
@@ -274,7 +274,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'
AND FB.uitgavetype <> 'TOTAAL'
AND FS.categorie = '{$cat}'
GROUP BY categorie";
return $this->get_query_row('bedrag');