diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod index adb09f7075ebb0a12c7a89f7ee6808487ac126a7..2ee5b09266d89b42df6370a68b6ddc00fd4151a9 100644 --- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod +++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod @@ -312,12 +312,6 @@ <fieldName>KeywordStrenght</fieldName> <isConsumer v="false" /> </entityDependency> - <entityDependency> - <name>35298a2b-6d6a-4af8-817d-1647068fe1fa</name> - <entityName>Salesproject_entity</entityName> - <fieldName>KeywordEstimation</fieldName> - <isConsumer v="false" /> - </entityDependency> <entityDependency> <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name> <entityName>Salesproject_entity</entityName> diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 9934cf67ed200aad94830784991f5c727273a016..ba6d97987914c6244f166356290f2e8fa2986075 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -378,21 +378,6 @@ </entityParameter> </children> </entityConsumer> - <entityConsumer> - <name>KeywordEstimation</name> - <fieldType>DEPENDENCY_OUT</fieldType> - <dependency> - <name>dependency</name> - <entityName>KeywordEntry_entity</entityName> - <fieldName>SpecificContainerKeywords</fieldName> - </dependency> - <children> - <entityParameter> - <name>containerName_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js</code> - </entityParameter> - </children> - </entityConsumer> <entityConsumer> <name>KeywordState</name> <fieldType>DEPENDENCY_OUT</fieldType> @@ -538,10 +523,6 @@ <name>PROBABILITY.displayValue</name> <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression> </dbRecordFieldMapping> - <dbRecordFieldMapping> - <name>ESTIMATIONVALUE.displayValue</name> - <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js</expression> - </dbRecordFieldMapping> <dbRecordFieldMapping> <name>STATE.displayValue</name> <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression> @@ -550,10 +531,6 @@ <name>PHASE.displayValue</name> <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression> </dbRecordFieldMapping> - <dbRecordFieldMapping> - <name>ESTIMATION.displayValue</name> - <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js</expression> - </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js deleted file mode 100644 index 148aaa91247ddc35cef8d361cb890735366d75b6..0000000000000000000000000000000000000000 --- a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js +++ /dev/null @@ -1,5 +0,0 @@ -import("system.result"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -result.string($KeywordRegistry.salesprojectEstimation()); \ No newline at end of file diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js deleted file mode 100644 index c2afa409b42fdc0e4a3cac10d1ef6e7645829dea..0000000000000000000000000000000000000000 --- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js +++ /dev/null @@ -1,6 +0,0 @@ -import("system.result"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE"); -result.string(sql); \ No newline at end of file diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js deleted file mode 100644 index eb8f932fddcd182a6256f4e7eb337a3f44884718..0000000000000000000000000000000000000000 --- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js +++ /dev/null @@ -1,6 +0,0 @@ -import("system.result"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE"); -result.string(sql); \ No newline at end of file diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js index 6d8a44d2954a8733e03de4ad59b7da5bf78d3929..c7677621cd70d4364d725c3f02f3ae341d0ce115 100644 --- a/process/KeywordRegistry_basic/process.js +++ b/process/KeywordRegistry_basic/process.js @@ -52,7 +52,6 @@ $KeywordRegistry.communicationMedium = function(){return "CommunicationMedium"}; $KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics"}; $KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness"}; $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"}; -$KeywordRegistry.salesprojectEstimation = function(){return "SalesprojectEstimation"}; $KeywordRegistry.salesprojectState = function(){return "SalesprojectState"}; $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"}; $KeywordRegistry.taskPriority = function(){return "TaskPriority"}; \ No newline at end of file