Rimo Import update

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;
 }