diff --git a/app/Http/Controllers/Admin/SupplierController.php b/app/Http/Controllers/Admin/SupplierController.php
index 2eddfb2..37a64bd 100644
--- a/app/Http/Controllers/Admin/SupplierController.php
+++ b/app/Http/Controllers/Admin/SupplierController.php
@@ -102,6 +102,12 @@ private function getSupplierDataFromRequest(Request $request)
             $data[$key] = $request->get($key);
         }
         $data['status'] = DbStatusFieldEnum::active;
+
+        // A hasCustomerCode mező csak akkor jelenik meg a formon, ha a SupplierCustomerCode
+        // feature flag aktív - ilyenkor nem szabad null-t írni a NOT NULL boolean oszlopba.
+        if ($request->has('hasCustomerCode')) {
+            $data['hasCustomerCode'] = $request->boolean('hasCustomerCode');
+        }
         if ($contactId = $request->get('contactId')) {
             $data['contactId'] = $contactId;
         } else {
diff --git a/resources/js/admin/supplier.js b/resources/js/admin/supplier.js
index 2028b58..7c050e3 100644
--- a/resources/js/admin/supplier.js
+++ b/resources/js/admin/supplier.js
@@ -18,6 +18,9 @@ if(typeof Supplier==='undefined'){
             if(typeof this.hasDeliveryConstraint ==="undefined"){
                 this.hasDeliveryConstraint=0;
             }
+            if(typeof this.hasCustomerCode ==="undefined"){
+                this.hasCustomerCode=0;
+            }
             if(typeof this.orderCutOffTime ==="undefined"){
                 this.orderCutOffTime=12;
             }
@@ -229,6 +232,7 @@ window.SupplierAdmin=function (options,SupplierItem) {
         $(CSSSelectorForm+' *[data-toggle=canSeeInOrder][data-title='+root.Supplier.canSeeInOrder+']').click();
         $(CSSSelectorForm+' *[data-toggle=hooreycaDataActive][data-title='+root.Supplier.hooreycaDataActive+']').click();
         $(CSSSelectorForm+' *[data-toggle=hasDeliveryConstraint][data-title='+root.Supplier.hasDeliveryConstraint+']').click();
+        $(CSSSelectorForm+' *[data-toggle=hasCustomerCode][data-title='+root.Supplier.hasCustomerCode+']').click();
         $(CSSSelectorForm+' input[name=orderCutOffTime]').val(root.Supplier.orderCutOffTime);
         $(CSSSelectorForm+' select[name=deliveryLeadTime]').val(root.Supplier.deliveryLeadTime);
         let productGroup=[];
diff --git a/resources/views/admin/supplier/create.blade.php b/resources/views/admin/supplier/create.blade.php
index 4f1ffb7..859928d 100644
--- a/resources/views/admin/supplier/create.blade.php
+++ b/resources/views/admin/supplier/create.blade.php
@@ -350,6 +350,20 @@ class="form-control" id="openHours"
 
             </div>
         </div>
+        @feature('SupplierCustomerCode')
+        <div class="form-group row">
+            <label for="hasCustomerCode" class="col-sm-2 col-form-label">Vevőkód funkció:</label>
+            <div class="col-sm-10">
+                <div class="input-group">
+                    <div  class="btn-group customRadioBtnGroup">
+                        <a class="btn btn-primary btn-sm notActive" data-toggle="hasCustomerCode" data-title="1">Igen</a>
+                        <a class="btn btn-primary btn-sm active" data-toggle="hasCustomerCode" data-title="0">Nem</a>
+                    </div>
+                    <input type="hidden" name="hasCustomerCode" value="0">
+                </div>
+            </div>
+        </div>
+        @endfeature
         <div class="form-group row">
             <label for="hasDeliveryConstraint" class="col-sm-2 col-form-label">Szállítási korlátozások:</label>
             <div class="col-sm-10">
@@ -380,20 +394,6 @@ class="form-control" id="openHours"
                 </select>
             </div>
         </div>
-        @feature('SupplierCustomerCode')
-        <div class="form-group row">
-            <label for="hasCustomerCode" class="col-sm-2 col-form-label">Vevőkód funkció:</label>
-            <div class="col-sm-10">
-                <div class="input-group">
-                    <div  class="btn-group customRadioBtnGroup">
-                        <a class="btn btn-primary btn-sm notActive" data-toggle="hasCustomerCode" data-title="1">Igen</a>
-                        <a class="btn btn-primary btn-sm active" data-toggle="hasCustomerCode" data-title="0">Nem</a>
-                    </div>
-                    <input type="hidden" name="hasCustomerCode" value="0">
-                </div>
-            </div>
-        </div>
-        @endfeature
        {{-- <div class="form-group row">
             <label for="hooreycaDataActive" class="col-sm-2 col-form-label">Hooreyca adatátadás:</label>
             <div class="col-sm-10">