diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 55fa397d0253ef78cdc5bb9519c25b0f0b4edc0c..49b997cfe10dd5bd2e38e4aed45fd7d8d7f4203a 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -77,6 +77,7 @@
       <name>STATUS</name>
       <title>Status</title>
       <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+      <state>EDITABLE</state>
     </entityField>
     <entityField>
       <name>USER_EDIT</name>
diff --git a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
index d4e696f145bcd50899e89d4b22719a11825f7ebb..8116a21437c56fedc8820cb134338edbb2fd7452 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
@@ -8,9 +8,6 @@ switch (vars.get("$sys.operatingstate"))
     case neon.OPERATINGSTATE_NEW:
         result.object(neon.COMPONENTSTATE_EDITABLE);
     break;
-    case neon.OPERATINGSTATE_EDIT:
-        result.object(neon.COMPONENTSTATE_INVISIBLE);
-    break;
     default:
         result.object(neon.COMPONENTSTATE_READONLY);
 }
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/status/onValueChange.js b/entity/Offer_entity/entityfields/status/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..992760ebe862218d86013571956767210b0d1bbe
--- /dev/null
+++ b/entity/Offer_entity/entityfields/status/onValueChange.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("OfferOrder_lib");
+
+var offerId = vars.getString("$field.OFFERID");
+if (offerId && vars.get("$field.STATUS") == 2 || vars.get("$field.STATUS") == 3 || vars.get("$field.STATUS") == 4)
+{
+    OfferUtils.setSent(offerId);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/status/possibleItemsProcess.js b/entity/Offer_entity/entityfields/status/possibleItemsProcess.js
index a59c5804d8ffcec63733ac0cd3b14f178b61f099..45a595aacaa3346d67c9b392babd106e87031a1a 100644
--- a/entity/Offer_entity/entityfields/status/possibleItemsProcess.js
+++ b/entity/Offer_entity/entityfields/status/possibleItemsProcess.js
@@ -1,7 +1,18 @@
+import("system.logging");
 import("system.result");
 import("Keyword_lib");
+import("system.vars");
+import("OfferOrder_lib");
 
-var items;
+var items = KeywordUtils.getStandardArray("OFFER.STATUS");
 
-items = KeywordUtils.getStandardArray("OFFER.STATUS");
+
+if (!OfferUtils.isEditable(vars.get("$field.STATUS")))
+{
+    items = items.filter(function(pItem) 
+    {
+        return !OfferUtils.isEditable(pItem[0]);
+    });
+}
+logging.log(items.toSource())
 result.object(items);
\ No newline at end of file
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index def21be810bff74180fa6198d3b52e8a86ba0162..2054faee42e32dc106040e7f15339f737684aa9c 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -61,6 +61,10 @@
           <name>443c8480-5676-43a3-9617-f86dae39c960</name>
           <entityField>OFFERDATE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>c5780864-ac2c-4650-8630-2690a9a074ea</name>
+          <entityField>STATUS</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>6f55da1e-281c-44ba-ab97-729b75516c32</name>
           <entityField>NET</entityField>