diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index b8bf5ba734410d5145cf7c6e18fd7e3610dcae2a..17d7315659bf292902964c5f528595b0fe2af890 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -292,6 +292,7 @@
<fieldType>ACTION</fieldType>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <actionOrder v="1" />
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityParameter>
@@ -362,6 +363,7 @@
<fieldType>ACTION</fieldType>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityConsumer>
diff --git a/entity/Communication_entity/entityfields/medium_id/onValueChange.js b/entity/Communication_entity/entityfields/medium_id/onValueChange.js
index cb592a48f0bdac70740ca19a55b22dfbadf77acc..93c60950bb64c10420d724f6f0bfdaf0a7e37da4 100644
--- a/entity/Communication_entity/entityfields/medium_id/onValueChange.js
+++ b/entity/Communication_entity/entityfields/medium_id/onValueChange.js
@@ -2,7 +2,10 @@ import("system.neon");
import("system.vars");
import("Entity_lib");
-var mediumId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MEDIUM_ID"));
+var isInternet = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MEDIUM_ID")) == "d08956b8-369e-4b65-88fa-1c37b3368ae3";
+var internetPreset = "https://";
-if (mediumId == "d08956b8-369e-4b65-88fa-1c37b3368ae3" && vars.get("$field.ADDR") == "") //medium == Internet
- neon.setFieldValue("$field.ADDR", "https://");
\ No newline at end of file
+if (isInternet && vars.get("$field.ADDR") == "") //medium == Internet
+ neon.setFieldValue("$field.ADDR", internetPreset);
+else if (!isInternet && vars.get("$field.ADDR") == internetPreset)
+ neon.setFieldValue("$field.ADDR", "");
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index f1f4d1f9f065c2511818928d44082b132e12fdf9..baa87a37cff792879254d79072b3d7dd41b6c582 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -140,6 +140,7 @@
<fieldType>ACTION</fieldType>
<title>New offer version</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
</entityActionField>
<entityField>
<name>NET</name>
@@ -200,6 +201,7 @@
<fieldType>ACTION</fieldType>
<title>Copy offer</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:COPY</iconId>
</entityActionField>
<entityField>
<name>VERSNR</name>
@@ -246,6 +248,7 @@
<fieldType>ACTION</fieldType>
<title>Print Offer</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_TEXT_O</iconId>
</entityActionField>
<entityField>
<name>CONTACT_ORG_ID</name>
@@ -374,6 +377,7 @@
<fieldType>ACTION</fieldType>
<title>Create receipt</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:DOLLAR</iconId>
</entityActionField>
<entityConsumer>
<name>Languages</name>
@@ -436,6 +440,12 @@
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7ef4bc3429e9acc6bf39b8fdba23626b476058b7..b4dd1d0c4058cf50264b6bf7b184f58f12fc5ab4 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -135,6 +135,7 @@
<fieldType>ACTION</fieldType>
<title>New receipt version</title>
<onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworderversion/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:DOLLAR</iconId>
</entityActionField>
<entityField>
<name>NET</name>
@@ -169,6 +170,7 @@
<fieldType>ACTION</fieldType>
<title>Copy receipt</title>
<onActionProcess>%aditoprj%/entity/Order_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:COPY</iconId>
</entityActionField>
<entityField>
<name>VERSNR</name>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 8546885e0c6fac6514549c4b229952894a742452..d14786dcc45996d2251fdb06cf76cc7199af42d1 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -295,6 +295,7 @@
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
<title>Edit defaults</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
+ <actionOrder v="1" />
<iconId>NEON:WRENCH</iconId>
</entityActionField>
<entityActionField>
@@ -303,6 +304,7 @@
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/documentation.adoc</documentation>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <actionOrder v="2" />
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityField>
@@ -359,6 +361,7 @@
<fieldType>ACTION</fieldType>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
<iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityActionField>
@@ -366,6 +369,7 @@
<fieldType>ACTION</fieldType>
<title>Customer Base Sheet</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
+ <actionOrder v="4" />
<iconId>VAADIN:FILE_TEXT_O</iconId>
</entityActionField>
<entityConsumer>
@@ -509,6 +513,7 @@
<fieldType>ACTION</fieldType>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <actionOrder v="3" />
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityConsumer>
@@ -535,6 +540,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
+ <title>Offers</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>ContactOffers</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed4a4f567aa9d494002b914426589ea37bc56682
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/offers/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 29c788355bd388815e39500992384f2fa419efa3..b806c1e1e1155840ec86ccf310a9dbeba4d27d99 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -248,6 +248,7 @@
<title>New offer</title>
<description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
<onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
</entityActionField>
<entityConsumer>
<name>Timetrackings</name>
@@ -351,6 +352,7 @@
<title>New time tracking</title>
<description>Opens the time tracking context in new-mode for the selected salesproject</description>
<onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:STOPWATCH</iconId>
</entityActionField>
<entityConsumer>
<name>KeywordProbabilties</name>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 7bbeed559ca783194d000902fe7ae43c7f5081f1..0ffa4b8165b3c4effbbb5ccb8aff2d468c538446 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -227,6 +227,7 @@
<fieldType>ACTION</fieldType>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <actionOrder v="1" />
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityParameter>
@@ -259,6 +260,7 @@
<fieldType>ACTION</fieldType>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
<iconId>VAADIN:CART</iconId>
</entityActionField>
<entityField>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index b708d1e0bf42a9d6971123830b96f16fbb28d63f..2afa7374638238f6035ac3ce4800f2ef7f5348e5 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -35,6 +35,11 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>50f61cda-5f85-4212-b3b2-3a55b9fae54d</name>
+ <entityField>Offers</entityField>
+ <view>OfferFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>fd099297-e87d-4ada-b7e7-e04afafbd8b0</name>
<entityField>Contracts</entityField>