Merge branch 'fronkdev' into 'master'

Rimo Import update

See merge request fronk/thetool!1347

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

@@ -237,6 +237,11 @@ class AddressHelper
                     $force_no_subcd = true;
                 }
             }
+
+            if($hausnummer && $hausnummer->rimo_id) {
+                $hausnummer = null;
+            }
+
             /*if(!$hausnummer) {
               //echo "Hausnummer adrcd $adrcd not found\n";
             } else {
@@ -254,6 +259,10 @@ class AddressHelper
                 if($hausnummer && $adrcd && $hausnummer->adrcd != $adrcd) {
                     $hausnummer = null;
                 }
+
+                if($hausnummer && $hausnummer->rimo_id) {
+                    $hausnummer = null;
+                }
             //}
             if (!$hausnummer) {
                 // dont create Hausnummer if Canceled in Rimo

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

@@ -893,9 +893,9 @@ function getServiceDnValues($dn)
         }
     }
 
-    if(!array_key_exists("Shelf", $fields) && array_key_exists("SpliceBox", $fields)) {
+    /*if(!array_key_exists("Shelf", $fields) && array_key_exists("SpliceBox", $fields)) {
         $fields['Shelf'] = $fields['SpliceBox'];
-    }
+    }*/
 
     return $fields;
 }

scripts/stuff/delete-private-homes.php

@@ -57,7 +57,7 @@ while($hausnummer_data = $db->fetch_object($res)) {
                 if(ADBWohneinheitModel::count(["oaid" => $del_unit->oaid]) == 1) {
                     //echo "!! Hausnummer ".$hausnummer->id.": cannot delete unit ".$del_unit->id." because it's the last Unit with OAID ".$oaid->oaid."\n";
                     $ftu_id = $del_unit->ftu_data["id"];
-                    RimoApi::unassignOaid($oaid->oaid, $ftu_id);
+                    Rimoapi::unassignOaid($oaid->oaid, $ftu_id);
 
                     echo "Deleting OAID ".$oaid->oaid." from FTU ".$ftu_id."\n";