From be00c24e07395aa96af2e7b141d6e88222fdc9bc Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Fri, 26 Jul 2019 17:37:23 +0200 Subject: [PATCH] SALESPROJECT_MILESTONE.VALUE -> SALESPROJECT_MILESTONE.MILESTONEVALUE --- ...ilestone_datatype_to_new_Keyword_logic.xml | 10 ++-- .../update_Milestone_to_new_Keyword.xml | 52 +++++++++---------- .../generatedData/SALESPROJECT_MILESTONE.xml | 34 ++++++------ .../init/struct/create_salesproject_cycle.xml | 2 +- aliasDefinition/Data_alias/Data_alias.aod | 35 +++++-------- .../SalesprojectMilestone_entity.aod | 15 +++--- .../displayValueProcess.js | 0 .../{value => milestonevalue}/titleProcess.js | 0 .../SalesprojectMilestoneInfo_view.aod | 4 +- process/Salesproject_lib/process.js | 2 +- 10 files changed, 74 insertions(+), 80 deletions(-) rename entity/SalesprojectMilestone_entity/entityfields/{value => milestonevalue}/displayValueProcess.js (100%) rename entity/SalesprojectMilestone_entity/entityfields/{value => milestonevalue}/titleProcess.js (100%) diff --git a/.liquibase/Data_alias/basic/2019.1.4/change_Milestone_datatype_to_new_Keyword_logic.xml b/.liquibase/Data_alias/basic/2019.1.4/change_Milestone_datatype_to_new_Keyword_logic.xml index c60175834a7..6e80ad7b501 100644 --- a/.liquibase/Data_alias/basic/2019.1.4/change_Milestone_datatype_to_new_Keyword_logic.xml +++ b/.liquibase/Data_alias/basic/2019.1.4/change_Milestone_datatype_to_new_Keyword_logic.xml @@ -7,10 +7,10 @@ ALTER TABLE SALESPROJECT_MILESTONE DROP COLUMN KIND; RENAME COLUMN SALESPROJECT_MILESTONE.KIND_NEW TO KIND; - ALTER TABLE SALESPROJECT_MILESTONE ADD COLUMN VALUE_NEW CHAR(36); - UPDATE SALESPROJECT_MILESTONE SET VALUE_NEW=CHAR(VALUE); - ALTER TABLE SALESPROJECT_MILESTONE DROP COLUMN VALUE; - RENAME COLUMN SALESPROJECT_MILESTONE.VALUE_NEW TO VALUE; + ALTER TABLE SALESPROJECT_MILESTONE ADD COLUMN MILESTONEVALUE_NEW CHAR(36); + UPDATE SALESPROJECT_MILESTONE SET MILESTONEVALUE_NEW=CHAR(MILESTONEVALUE); + ALTER TABLE SALESPROJECT_MILESTONE DROP COLUMN MILESTONEVALUE; + RENAME COLUMN SALESPROJECT_MILESTONE.MILESTONEVALUE_NEW TO MILESTONEVALUE; </sql> </changeSet> @@ -22,6 +22,6 @@ </preConditions> <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="KIND" newDataType="NVARCHAR(80)"/> - <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="VALUE" newDataType="CHAR(36)"/> + <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="MILESTONEVALUE" newDataType="CHAR(36)"/> </changeSet> </databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml index b0cf85cae9b..20fa0cd9303 100644 --- a/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml +++ b/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml @@ -9,8 +9,8 @@ </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASENQC"/> - <where>KIND = ? and VALUE in (?,?,?,?,?,?,?,?,?,?,?)</where> + <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/> + <where>KIND = ? and MILESTONEVALUE in (?,?,?,?,?,?,?,?,?,?,?)</where> <whereParams> <param value="SalesprojectPhase" /> <param value="1" /> @@ -27,48 +27,48 @@ </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASEMAL"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectPhase" /> <param value="2" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASEMQL"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJPHASEMQL"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectPhase" /> <param value="3" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASESAL"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectPhase" /> <param value="4" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASESQO"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectPhase" /> <param value="5" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASEOFFER"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectPhase" /> <param value="6" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJPHASENEGO"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJPHASENEGO"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectPhase" /> <param value="7" /> @@ -84,48 +84,48 @@ </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJSTATOPEN"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectState" /> <param value="1" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJSTATPOST"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJSTATPOST"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectState" /> <param value="2" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJSTATABORT"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJSTATABORT"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectState" /> <param value="3" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJSTATPARTIAL"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJSTATPARTIAL"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectState" /> <param value="4" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="SALPROJSTATLOST"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="SALPROJSTATLOST"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectState" /> <param value="5" /> </whereParams> </update> <update tableName="SALESPROJECT_MILESTONE"> - <column name="VALUE" value="d8a60f60-a4e6-46ee-88ec-bac53e1afedd"/> - <where>KIND = ? and VALUE = ?</where> + <column name="MILESTONEVALUE" value="d8a60f60-a4e6-46ee-88ec-bac53e1afedd"/> + <where>KIND = ? and MILESTONEVALUE = ?</where> <whereParams> <param value="SalesprojectState" /> <param value="6" /> diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml index c635726159f..ec5b3c041e4 100644 --- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml +++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml @@ -7,14 +7,14 @@ <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/> <column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASENQC"/> + <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-06-15T01:34:58"/> <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/> <column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/> <column name="KIND" value="SalesprojectState"/> - <column name="VALUE" value="SALPROJSTATOPEN"/> + <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> @@ -23,7 +23,7 @@ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/> <column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASENQC"/> + <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-10T08:08:07"/> @@ -32,7 +32,7 @@ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/> <column name="SALESPROJECT_MILESTONEID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASEMAL"/> + <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-06-17T08:08:07"/> @@ -40,14 +40,14 @@ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/> <column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASESAL"/> + <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-17T08:08:08"/> <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/> <column name="SALESPROJECT_MILESTONEID" value="5189697c-5dbf-4d10-a163-dfde87e490ab"/> <column name="KIND" value="SalesprojectState"/> - <column name="VALUE" value="SALPROJSTATOPEN"/> + <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_END" valueDate="2019-05-23T10:44:48"/> @@ -55,14 +55,14 @@ <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/> <column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASESAL"/> + <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-17T08:39:38"/> <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/> <column name="SALESPROJECT_MILESTONEID" value="d77dc2ae-f12d-49ac-9a8f-ee0b5086f6ef"/> <column name="KIND" value="SalesprojectState"/> - <column name="VALUE" value="SALPROJSTATOPEN"/> + <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_END" valueDate="2019-05-23T10:44:26"/> @@ -70,14 +70,14 @@ <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/> <column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASESAL"/> + <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-22T11:51:20"/> <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/> <column name="SALESPROJECT_MILESTONEID" value="4529f6d1-2d4d-4dfc-b404-6a3d30e7153b"/> <column name="KIND" value="SalesprojectState"/> - <column name="VALUE" value="SALPROJSTATOPEN"/> + <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-22T01:42:51"/> @@ -85,7 +85,7 @@ <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/> <column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASESQO"/> + <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> @@ -94,7 +94,7 @@ <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/> <column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASEMAL"/> + <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> @@ -102,7 +102,7 @@ <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/> <column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/> <column name="KIND" value="SalesprojectState"/> - <column name="VALUE" value="SALPROJSTATOPEN"/> + <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> @@ -112,7 +112,7 @@ <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/> <column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASEOFFER"/> + <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-23T10:44:26"/> @@ -120,7 +120,7 @@ <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/> <column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASENEGO"/> + <column name="MILESTONEVALUE" value="SALPROJPHASENEGO"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-23T10:44:48"/> @@ -128,7 +128,7 @@ <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/> <column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASESQO"/> + <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/> </insert> <insert tableName="SALESPROJECT_MILESTONE"> <column name="DATE_START" valueDate="2019-05-23T11:30:10"/> @@ -137,7 +137,7 @@ <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/> <column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/> <column name="KIND" value="SalesprojectPhase"/> - <column name="VALUE" value="SALPROJPHASEMQC"/> + <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/> </insert> </changeSet> </databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml index a74e8725d21..34aa92987db 100644 --- a/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml +++ b/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml @@ -10,7 +10,7 @@ </column> <column name="KIND" type="INTEGER"/> - <column name="VALUE" type="INTEGER"/> + <column name="MILESTONEVALUE" type="INTEGER"/> <column name="DATE_START" type="DATETIME"/> <column name="DATE_END" type="DATETIME"/> diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index a91c9f653ba..1fe448e5fd9 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -7705,27 +7705,6 @@ </customBooleanProperty> </customProperties> </entityFieldDb> - <entityFieldDb> - <name>VALUE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title>Value</title> - <description></description> - <customProperties> - <customBooleanProperty> - <name>log</name> - <global v="false" /> - <property v="true" /> - </customBooleanProperty> - </customProperties> - </entityFieldDb> <entityFieldDb> <name>SALESPROJECT_ID</name> <dbName></dbName> @@ -7810,6 +7789,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>MILESTONEVALUE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod index d3883f01152..b1eca9eed3b 100644 --- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod +++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod @@ -43,11 +43,11 @@ <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/type/displayValueProcess.js</displayValueProcess> </entityField> <entityField> - <name>VALUE</name> + <name>MILESTONEVALUE</name> <consumer>Keywords</consumer> <mandatory v="true" /> - <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js</titleProcess> - <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js</displayValueProcess> + <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js</titleProcess> + <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/displayValueProcess.js</displayValueProcess> </entityField> <entityParameter> <name>SalesprojectId_param</name> @@ -181,10 +181,6 @@ <name>KIND.value</name> <recordfield>SALESPROJECT_MILESTONE.KIND</recordfield> </dbRecordFieldMapping> - <dbRecordFieldMapping> - <name>VALUE.value</name> - <recordfield>SALESPROJECT_MILESTONE.VALUE</recordfield> - </dbRecordFieldMapping> <dbRecordFieldMapping> <name>SALESPROJECT_ID.value</name> <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_ID</recordfield> @@ -193,6 +189,11 @@ <name>PARENT_ID.value</name> <recordfield>SALESPROJECT_MILESTONE.PARENT_ID</recordfield> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>MILESTONEVALUE.value</name> + <recordfield>SALESPROJECT_MILESTONE.MILESTONEVALUE</recordfield> + <isFilterable v="true" /> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/displayValueProcess.js similarity index 100% rename from entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js rename to entity/SalesprojectMilestone_entity/entityfields/milestonevalue/displayValueProcess.js diff --git a/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js b/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js similarity index 100% rename from entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js rename to entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod index 383e3c57460..ca235cdcca0 100644 --- a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod +++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod @@ -12,7 +12,7 @@ <ganttViewTemplate> <name>MilestoneGantt</name> <uidField>SALESPROJECT_MILESTONEID</uidField> - <titleField>VALUE</titleField> + <titleField>MILESTONEVALUE</titleField> <beginDateField>DATE_START</beginDateField> <endDateField>dateEndGantt</endDateField> <predecessorIdField>PARENT_ID</predecessorIdField> @@ -20,7 +20,7 @@ <columns> <neonTableColumn> <name>4c261b96-17d3-424e-8297-3ff46d780516</name> - <entityField>VALUE</entityField> + <entityField>MILESTONEVALUE</entityField> </neonTableColumn> <neonTableColumn> <name>c055c340-0f7b-4c91-a0a6-22e20511d2a9</name> diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js index 67be10b3c5b..981f58e5978 100644 --- a/process/Salesproject_lib/process.js +++ b/process/Salesproject_lib/process.js @@ -69,7 +69,7 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec db.insertData( "SALESPROJECT_MILESTONE", - ["SALESPROJECT_MILESTONEID", "SALESPROJECT_ID", "KIND", "VALUE", "DATE_START", "PARENT_ID"], + ["SALESPROJECT_MILESTONEID", "SALESPROJECT_ID", "KIND", "MILESTONEVALUE", "DATE_START", "PARENT_ID"], null, [util.getNewUUID(), salesprojectId, type, value, vars.get("$sys.date"), id]); if (notifyForecast) { -- GitLab