Merge master into #1030899-adresse-angebot-beleg

entity/Org_entity/Org_entity.aod

@@ -444,6 +444,22 @@
       <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
       <iconId>NEON:HISTORY</iconId>
     </entityActionField>
+    <entityOutgoingField>
+      <name>OrgSalesproject_dfo</name>
+      <title>Salesprojects</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Salesproject_entity</entityName>
+        <fieldName>SalesprojectOrg_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>relationId_param</name>
+          <code>%aditoprj%/entity/Org_entity/entityfields/orgsalesproject_dfo/children/relationid_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Org_entity/entityfields/orgsalesproject_dfo/children/relationid_param/code.js

+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file

entity/Product_entity/recordcontainers/db/onDBUpdate.js

@@ -8,4 +8,4 @@ FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
         ProductUtils.setImage(vars.get("$field.PRODUCTID"), value);
     else
         ProductUtils.removeImage(vars.get("$field.PRODUCTID"));
-}
+});

entity/Salesproject_entity/Salesproject_entity.aod

@@ -316,12 +316,31 @@
         </entityParameter>
       </children>
     </entityOutgoingField>
+    <entityIncomingField>
+      <name>SalesprojectOrg_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>5f8500a6-ec3c-4792-ac6d-4bf2a39b89f2</name>
+          <entityName>Org_entity</entityName>
+          <fieldName>OrgSalesproject_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityIncomingField>
+    <entityParameter>
+      <name>relationId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
       <fromClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <onDBInsert>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <onDBUpdate>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
       <linkInformation>

entity/Salesproject_entity/recordcontainers/db/conditionProcess.js

+import("system.db");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+result.string(db.translateCondition(
+                SqlCondition.begin()
+                            .andPrepareVars("SALESPROJECT.RELATION_ID", "$param.relationId_param")
+                            .build("1 = 1")));
\ No newline at end of file

neonView/OrgMain_view/OrgMain_view.aod

@@ -40,5 +40,10 @@
       <entityField>OrgContract_dfo</entityField>
       <view>ContractFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>748d46a2-96ba-4f47-bf18-1f3b2fd9d708</name>
+      <entityField>OrgSalesproject_dfo</entityField>
+      <view>SalesprojectFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>