diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index bbe19fd7cf0c5a29fb1036d0841e1f07169f5e32..897341b55c8b1de5daeaaf8e62990f34e7f08605 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -147,39 +147,34 @@
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectSource_entity</entityName>
- <fieldName>SalesprojectSouces</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>SalesprojectPhaseMilestones</name>
<dependency>
<name>dependency</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>PhaseMilestones</fieldName>
+ <entityName>SalesprojectSource_entity</entityName>
+ <fieldName>SalesprojectSouces</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>SalesprojectPhaseMilestones</name>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Forecasts</name>
<dependency>
<name>dependency</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Links</fieldName>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>PhaseMilestones</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Forecasts</name>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -192,15 +187,15 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Competitions</name>
- <selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
- <entityName>Competition_entity</entityName>
+ <entityName>Forecast_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Competitions</name>
+ <selectionMode>MULTI</selectionMode>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -213,14 +208,14 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Offers</name>
<dependency>
<name>dependency</name>
- <entityName>Offer_entity</entityName>
+ <entityName>Competition_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -233,14 +228,14 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Activities</name>
<dependency>
<name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Links</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
<children>
<entityParameter>
<name>PresetLinks_param</name>
@@ -255,14 +250,14 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Members</name>
<dependency>
<name>dependency</name>
- <entityName>Member_entity</entityName>
- <fieldName>WithDistrictResponsibles</fieldName>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Members</name>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -287,6 +282,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/members/children/salesprojectcode_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>WithDistrictResponsibles</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newOffer</name>
@@ -299,11 +299,6 @@
<entityConsumer>
<name>Timetrackings</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Timetrackings</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -314,6 +309,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Timetrackings</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
@@ -337,11 +337,6 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -356,15 +351,15 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/mstteamid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -375,6 +370,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newTimetracking</name>
@@ -385,11 +385,6 @@
</entityActionField>
<entityConsumer>
<name>KeywordProbabilties</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -398,14 +393,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -413,6 +408,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -432,17 +432,17 @@
<entityConsumer>
<name>KeywordWonLost</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>REASONS</name>
@@ -459,6 +459,17 @@
</entityField>
<entityProvider>
<name>Salesprojects</name>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>PresetTitle_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
@@ -479,17 +490,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>PresetTitle_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityActionField>
<name>newTask</name>
@@ -500,11 +500,6 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -519,17 +514,14 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>OpenSalesprojects</name>
- <dependencies>
- <entityDependency>
- <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Status_param</name>
@@ -540,6 +532,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>Status_param</name>
@@ -548,27 +548,22 @@
</entityParameter>
<entityConsumer>
<name>SalesprojectStateMilestones</name>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>StateMilestones</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>StateMilestones</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -579,15 +574,15 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -598,29 +593,29 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistories</name>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistories</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Classifications</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>Classification_entity</entityName>
- <fieldName>Classifications</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
@@ -635,6 +630,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>RemainingTime</name>
@@ -648,11 +648,6 @@
</entityField>
<entityConsumer>
<name>SalesprojectForecastCharts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>FilteredTurnovers</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
@@ -671,20 +666,25 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>SalesprojectPhaseStepper</name>
<dependency>
<name>dependency</name>
- <entityName>SalesprojectPhase_entity</entityName>
- <fieldName>Phases</fieldName>
+ <entityName>Turnover_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>SalesprojectPhaseStepper</name>
<children>
<entityParameter>
<name>CurrentPhase_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectPhase_entity</entityName>
+ <fieldName>Phases</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PHASEINFO</name>
@@ -707,17 +707,21 @@
</entityField>
<entityConsumer>
<name>ProjectTypeAttribute</name>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/parentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>QuickEntrySalesprojects</name>
diff --git a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js
index cc6924394ae950c43386275dda2c8db5d7a9c0ed..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/parentid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/parentid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ced111e47d6e67cf16c54610df4b5eb6b893961a
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/parentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("AttributeRegistry_basic");
+import("system.result");
+
+result.string($AttributeRegistry.salesprojectType());
\ No newline at end of file