Changed type filter to tenant filter in Address/Index

application/Address/AddressController.php

@@ -82,12 +82,12 @@ class AddressController extends mfBaseController {
       if(!array_key_exists("customer_number", $filter) || !$filter["customer_number"]) {
         if(array_key_exists("type", $filter)) {
           if($filter["type"] == "xinon") {
-            $new_filter["customer_number"] = true;
+            $new_filter["customer_or_fibu_numbers"] = true;
           } elseif($filter["type"] == "others") {
-            $new_filter["customer_number"] = false;
+            $new_filter["customer_or_fibu_numbers"] = false;
           }
         } else {
-          $new_filter["customer_number"] = true;
+          $new_filter["customer_or_fibu_numbers"] = true; // default
         }
         unset($filter["type"]);
         unset($filter["customer_number"]);

application/Address/AddressModel.php

@@ -267,6 +267,15 @@ class AddressModel {
       }
     }
     
+    if(array_key_exists("customer_or_fibu_numbers", $filter)) {
+      $cn = $filter["customer_or_fibu_numbers"];
+      if($cn === true) {
+        $where .= " AND (customer_number > 0 OR fibu_account_number > 0 OR fibu_supplier_number > 0)";
+      } elseif($cn === false || $cn === null) {
+        $where .= " AND customer_number IS NULL AND fibu_account_number IS NULL AND fibu_supplier_number IS NULL";
+      }
+    }
+    
     if(array_key_exists("spin", $filter)) {
       $spin = FronkDB::singleton()->escape($filter["spin"]);
       if($spin) {