Merge branch 'fronkdev' into 'master'

RimoImport: setting rimo_deleted to 0 if exists in rimo

See merge request fronk/thetool!1351

scripts/adb-rimo-import/rimo-import.php

@@ -375,6 +375,10 @@ foreach ($clusters as $cluster_data) {
                 }
 
                 $unit = new \ADBWohneinheit($unit->id);
+                if($unit->rimo_deleted) {
+                    $unit->rimo_deleted = 0;
+                    $unit->save(["no_updates" => 1]);
+                }
 
                 if ($unit->extref != $home_rimo_id) {
                     $unit->extref = $home_rimo_id;