refactor Salesproject entities

entity/Organisation_entity/Organisation_entity.aod

@@ -181,7 +181,7 @@
         <entityDependency>
           <name>120c8bfb-1b03-408d-97e7-88e3b7249c53</name>
           <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
+          <fieldName>Organisation</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
@@ -292,7 +292,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
         <entityDependency>
           <name>1fa399a8-8c0c-470f-94a8-6c748293d93d</name>
           <entityName>SalesprojectCompetition_entity</entityName>
-          <fieldName>CompetitionOrg_lookup_dfo</fieldName>
+          <fieldName>Organisations</fieldName>
           <isConsumer v="false" />
         </entityDependency>
         <entityDependency>

entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod

@@ -8,14 +8,14 @@
       <name>#PROVIDER</name>
     </entityProvider>
     <entityProvider>
-      <name>SalesprojectClassificatonEntry_dfi</name>
+      <name>SalesprojectClassificatonEntries</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>jdito</recordContainer>
       <dependencies>
         <entityDependency>
           <name>a7414022-56d3-4ca0-b15f-33601b655d78</name>
           <entityName>SalesprojectClassification_entity</entityName>
-          <fieldName>SalesprojectClassificationEntry_dfo</fieldName>
+          <fieldName>SalesprojectClassificationEntries</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>

entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod

@@ -12,28 +12,28 @@
       <name>CLASSNAME</name>
     </entityField>
     <entityConsumer>
-      <name>SalesprojectClassificationEntry_dfo</name>
+      <name>SalesprojectClassificationEntries</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectClassificationEntry_entity</entityName>
-        <fieldName>SalesprojectClassificatonEntry_dfi</fieldName>
+        <fieldName>SalesprojectClassificatonEntries</fieldName>
       </dependency>
       <children>
         <entityParameter>
           <name>ClassId_param</name>
-          <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/classid_param/code.js</code>
+          <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/code.js</code>
           <triggerRecalculation v="true" />
         </entityParameter>
         <entityParameter>
           <name>SalesprojectId_param</name>
-          <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/salesprojectid_param/code.js</code>
+          <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js</code>
           <triggerRecalculation v="true" />
         </entityParameter>
       </children>
     </entityConsumer>
     <entityProvider>
-      <name>SalesprojectClassification_dfi</name>
+      <name>SalesprojectClassifications</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <title>Classification</title>
       <recordContainer>jdito</recordContainer>

entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file

entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod

@@ -58,11 +58,11 @@
       <name>SalesprojectId_param</name>
       <expose v="true" />
       <triggerRecalculation v="true" />
-      <mandatory v="false" />
+      <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityProvider>
-      <name>SalesprojectCompetition_dfi</name>
+      <name>SalesprojectCompetitions</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -77,7 +77,7 @@
     <entityField>
       <name>RELATION_ID</name>
       <title>Organisation</title>
-      <consumer>CompetitionOrg_lookup_dfo</consumer>
+      <consumer>Organisations</consumer>
       <linkedContext>Organisation_context</linkedContext>
     </entityField>
     <entityField>
@@ -93,7 +93,7 @@
       <state>AUTO</state>
     </entityField>
     <entityConsumer>
-      <name>SalesprojectCompetitionOrg_dfo</name>
+      <name>Organisation</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -103,7 +103,7 @@
       <children>
         <entityParameter>
           <name>relationId_param</name>
-          <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesprojectcompetitionorg_dfo/children/relationid_param/code.js</code>
+          <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js</code>
           <expose v="true" />
           <triggerRecalculation v="true" />
         </entityParameter>
@@ -125,7 +125,7 @@
       <possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
     <entityConsumer>
-      <name>CompetitionOrg_lookup_dfo</name>
+      <name>Organisations</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>

entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod

@@ -61,11 +61,11 @@
       <name>SalesprojectId_param</name>
       <expose v="true" />
       <triggerRecalculation v="true" />
-      <mandatory v="false" />
+      <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityProvider>
-      <name>SalesprojectCycle_dfi</name>
+      <name>SalesprojectCycles</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>

entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod

@@ -62,11 +62,11 @@
       <name>SalesprojectId_param</name>
       <expose v="true" />
       <triggerRecalculation v="true" />
-      <mandatory v="false" />
+      <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityProvider>
-      <name>SalesprojectForecast_dfi</name>
+      <name>SalesprojectForecasts</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>

entity/SalesprojectMember_entity/SalesprojectMember_entity.aod

@@ -48,7 +48,7 @@
       <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js</valueProcess>
     </entityField>
     <entityProvider>
-      <name>SalesprojectMember_dfi</name>
+      <name>SalesprojectMembers</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -64,7 +64,7 @@
       <name>SalesprojectId_param</name>
       <expose v="true" />
       <triggerRecalculation v="true" />
-      <mandatory v="false" />
+      <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>

entity/SalesprojectSource_entity/SalesprojectSource_entity.aod

@@ -9,7 +9,7 @@
       <name>#PROVIDER</name>
     </entityProvider>
     <entityProvider>
-      <name>SalesprojectSouce_dfi</name>
+      <name>SalesprojectSouces</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>

entity/Salesproject_entity/Salesproject_entity.aod

@@ -139,7 +139,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectSource_entity</entityName>
-        <fieldName>SalesprojectSouce_dfi</fieldName>
+        <fieldName>SalesprojectSouces</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -156,7 +156,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectCycle_entity</entityName>
-        <fieldName>SalesprojectCycle_dfi</fieldName>
+        <fieldName>SalesprojectCycles</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -173,7 +173,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectForecast_entity</entityName>
-        <fieldName>SalesprojectForecast_dfi</fieldName>
+        <fieldName>SalesprojectForecasts</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -190,7 +190,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectCompetition_entity</entityName>
-        <fieldName>SalesprojectCompetition_dfi</fieldName>
+        <fieldName>SalesprojectCompetitions</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -245,7 +245,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectMember_entity</entityName>
-        <fieldName>SalesprojectMember_dfi</fieldName>
+        <fieldName>SalesprojectMembers</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -262,7 +262,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>SalesprojectClassification_entity</entityName>
-        <fieldName>SalesprojectClassification_dfi</fieldName>
+        <fieldName>SalesprojectClassifications</fieldName>
       </dependency>
       <children>
         <entityParameter>

neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod

@@ -24,7 +24,7 @@
     </genericViewTemplate>
     <neonViewReference>
       <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
-      <entityField>SalesprojectClassificationEntry_dfo</entityField>
+      <entityField>SalesprojectClassificationEntries</entityField>
       <view>SalesprojectClassificationEntryPreview_view</view>
     </neonViewReference>
   </children>

neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod

@@ -60,7 +60,7 @@
     </genericViewTemplate>
     <neonViewReference>
       <name>3ad88e2c-b159-4c97-b81f-beb689b0fc1c</name>
-      <entityField>SalesprojectCompetitionOrg_dfo</entityField>
+      <entityField>Organisation</entityField>
       <view>OrganisationAttr_view</view>
     </neonViewReference>
   </children>