diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0b1c27fbc1226e65f421cfeb989e0ea5b25bac8b..75c63f0a5497e4ec1832c41ce571960ccd64e9bf 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -881,6 +881,20 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityProvider>
+ <name>SentOffers</name>
+ <children>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/sentoffers/children/offerstatus_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/sentoffers/children/offerstatus_param/valueProcess.js b/entity/Offer_entity/entityfields/sentoffers/children/offerstatus_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..54675da8f571c86ed8fcb1b757bf1dcd08ff8856
--- /dev/null
+++ b/entity/Offer_entity/entityfields/sentoffers/children/offerstatus_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.offerStatus$sent());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/conditionProcess.js b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
index 25a5d52c1d4d1808cee87b68e601d8f6bf2a346f..d06014df7b5d8a907207e3547acedbdece0084eb 100644
--- a/entity/Offer_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
@@ -11,5 +11,8 @@ else {
cond.andPrepareVars("OFFER.OBJECT_ROWID", "$param.ObjectRowId_param");
cond.andPrepareVars("OFFER.OBJECT_TYPE", "$param.ObjectType_param");
}
+
+cond.andPrepareVars("OFFER.STATUS", "$param.OfferStatus_param")
+
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
index edfcaddcb840d27088338ff6d7b3624ce73938ff..119e4fcf205776e50ba9c179ad63300a763c32c8 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
@@ -1,13 +1,10 @@
-import("system.datetime");
-import("system.db");
import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Sql_lib");
-import("system.SQLTYPES")
+import("system.entities");
-var opensp = db.cell("select count(STATE) from SALESPROJECT \n\
-join AB_KEYWORD_ENTRY on KEYID = STATE and CONTAINER = 'SalesprojectState' and TITLE = 'Open' \n\
-group by KEYID, AB_KEYWORD_ENTRY.TITLE");
-
+var conf = entities.createConfigForLoadingRows()
+ .entity("Salesproject_entity")
+ .provider("OpenSalesprojects");
+
+var opensp = entities.getRowCount(conf);
+
result.string(opensp);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
index 8d610d08abc6ca281facdb29e790696741a5dd85..df5b51bfc46e739539a7520208607cf568100742 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
@@ -1,12 +1,10 @@
-import("system.datetime");
-import("system.db");
import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Sql_lib");
-import("system.SQLTYPES")
+import("system.entities");
-var sentoffer = db.cell("select count(STATUS) from OFFER join AB_KEYWORD_ENTRY \n\
-on KEYID = STATUS and CONTAINER = 'OfferStatus' and TITLE = 'Sent' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
-
-result.string(sentoffer);
\ No newline at end of file
+var conf = entities.createConfigForLoadingRows()
+ .entity("Offer_entity")
+ .provider("SentOffers");
+
+var opensp = entities.getRowCount(conf);
+
+result.string(opensp);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index f4f2e4633f0340d806b1169e8e0e0c3a9b8147ee..9623ca34b8467a46a558b7542df87d0d9a523773 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -475,7 +475,7 @@
</children>
</entityConsumer>
<entityProvider>
- <name>openSalesprojects</name>
+ <name>OpenSalesprojects</name>
<dependencies>
<entityDependency>
<name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
diff --git a/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a82320164b8a1ee9cce3001fdbe18a385a7c77c
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/2pensalesprojects/children/state_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectState$open());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js b/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js
index 9074d4eece1ed8c26040d657c5c989aa1950ac12..2a82320164b8a1ee9cce3001fdbe18a385a7c77c 100644
--- a/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/opensalesprojects/children/state_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
-
-//The Id for the salesproject state keyword OPEN
-result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712");
\ No newline at end of file
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectState$open());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
index f3a32a333dafdf4816b96cb701a339e4613f2827..e9ce76482ee4bba0a59242acf6671035847598d6 100644
--- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
@@ -3,18 +3,8 @@ import("system.result");
import("system.vars");
import("Sql_lib");
-if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
-{
- result.string(db.translateCondition(
- SqlCondition.begin()
- .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
- .andPrepareVars("SALESPROJECT.STATE", "$param.State_param")
- .build("1 = 2")));
-}
-else
-{
- result.string(db.translateCondition(
- SqlCondition.begin()
- .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
- .build("1 = 1")));
-}
\ No newline at end of file
+result.string(db.translateCondition(
+ SqlCondition.begin()
+ .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
+ .andPrepareVars("SALESPROJECT.STATE", "$param.State_param")
+ .build("1 = 1")));
\ No newline at end of file