Merge branch 'feature/alleInstrumenteninCompactSop' into develop

# Conflicts: # application/core/MY_Controller.php
2022-05-24 21:34:16 +02:00
parent 8f54333a55 a08028d5b6
commit e5ccf831ec
7 changed files with 1845 additions and 27 deletions
@@ -44,7 +44,7 @@ class compactsoponderdelen_model extends MY_Model{
                     WHERE  L.orgid = {$orgid}
                     AND    SOP.in_sop = 'T'
                     AND    ((M.instrument_type <> 'FIN' && M.instrument_type <> 'DIV') || O.soort = 4 )    
-					 ORDER BY ordening, instrument";
+					 ORDER BY naam ";
        return $this->get_query_result();
    }
    function getOnderdeel($nummer, $orgsoort){