From 2fe84e79d56123117c6b3ae9e73202090749f997 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 26 Jul 2019 16:27:31 +0200
Subject: [PATCH] =?UTF-8?q?SALESPROJECT=5FMILESTONE=C2=B4.TYPE=20to=20SALE?=
=?UTF-8?q?SPROJECT=5FMILESTONE.KIND?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...ilestone_datatype_to_new_Keyword_logic.xml | 10 ++--
.../update_Milestone_to_new_Keyword.xml | 34 ++++++-------
.../generatedData/SALESPROJECT_MILESTONE.xml | 34 ++++++-------
.../init/struct/create_salesproject_cycle.xml | 2 +-
aliasDefinition/Data_alias/Data_alias.aod | 49 ++++++-------------
.../SalesprojectMilestone_entity.aod | 20 ++++----
.../valueProcess.js | 0
.../valueProcess.js | 0
.../recordcontainers/db/conditionProcess.js | 2 +-
process/Salesproject_lib/process.js | 8 +--
10 files changed, 68 insertions(+), 91 deletions(-)
rename entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/{type_param => kind_param}/valueProcess.js (100%)
rename entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/{type_param => kind_param}/valueProcess.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 6eee124a8c..c60175834a 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
@@ -2,10 +2,10 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet dbms="derby" author="j.hoermann" id="be098ba0-30ed-4e01-893e-928b1ac86923">
<sql>
- ALTER TABLE SALESPROJECT_MILESTONE ADD COLUMN TYPE_NEW VARCHAR(80);
- UPDATE SALESPROJECT_MILESTONE SET TYPE_NEW=CHAR(TYPE);
- ALTER TABLE SALESPROJECT_MILESTONE DROP COLUMN TYPE;
- RENAME COLUMN SALESPROJECT_MILESTONE.TYPE_NEW TO TYPE;
+ ALTER TABLE SALESPROJECT_MILESTONE ADD COLUMN KIND_NEW VARCHAR(80);
+ UPDATE SALESPROJECT_MILESTONE SET KIND_NEW=CHAR(KIND);
+ 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);
@@ -21,7 +21,7 @@
</not>
</preConditions>
- <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="TYPE" newDataType="NVARCHAR(80)"/>
+ <modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="KIND" newDataType="NVARCHAR(80)"/>
<modifyDataType tableName="SALESPROJECT_MILESTONE" columnName="VALUE" 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 9d79ee64c1..b0cf85cae9 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
@@ -2,15 +2,15 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="j.hoermann" id="ec9bae68-ca27-4597-9808-fc333246b3a0">
<update tableName="SALESPROJECT_MILESTONE">
- <column name="TYPE" value="SalesprojectPhase"/>
- <where>TYPE = ?</where>
+ <column name="KIND" value="SalesprojectPhase"/>
+ <where>KIND = ?</where>
<whereParams>
<param value="1" />
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASENQC"/>
- <where>TYPE = ? and VALUE in (?,?,?,?,?,?,?,?,?,?,?)</where>
+ <where>KIND = ? and VALUE in (?,?,?,?,?,?,?,?,?,?,?)</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="1" />
@@ -28,7 +28,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASEMAL"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="2" />
@@ -36,7 +36,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASEMQL"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="3" />
@@ -44,7 +44,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASESAL"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="4" />
@@ -52,7 +52,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASESQO"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="5" />
@@ -60,7 +60,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASEOFFER"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="6" />
@@ -68,7 +68,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJPHASENEGO"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
<param value="7" />
@@ -77,15 +77,15 @@
<update tableName="SALESPROJECT_MILESTONE">
- <column name="TYPE" value="SalesprojectState"/>
- <where>TYPE = ?</where>
+ <column name="KIND" value="SalesprojectState"/>
+ <where>KIND = ?</where>
<whereParams>
<param value="2" />
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJSTATOPEN"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
<param value="1" />
@@ -93,7 +93,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJSTATPOST"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
<param value="2" />
@@ -101,7 +101,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJSTATABORT"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
<param value="3" />
@@ -109,7 +109,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJSTATPARTIAL"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
<param value="4" />
@@ -117,7 +117,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="SALPROJSTATLOST"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
<param value="5" />
@@ -125,7 +125,7 @@
</update>
<update tableName="SALESPROJECT_MILESTONE">
<column name="VALUE" value="d8a60f60-a4e6-46ee-88ec-bac53e1afedd"/>
- <where>TYPE = ? and VALUE = ?</where>
+ <where>KIND = ? and VALUE = ?</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 63753bb774..c635726159 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
@@ -6,14 +6,14 @@
<column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" 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="TYPE" value="SalesprojectState"/>
+ <column name="KIND" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
@@ -22,7 +22,7 @@
<column name="DATE_END" valueDate="2019-05-10T08:08:07"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASENQC"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -31,7 +31,7 @@
<column name="PARENT_ID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_MILESTONEID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASEMAL"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -39,14 +39,14 @@
<column name="PARENT_ID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" 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="TYPE" value="SalesprojectState"/>
+ <column name="KIND" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -54,14 +54,14 @@
<column name="DATE_START" valueDate="2019-05-10T08:39:38"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" 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="TYPE" value="SalesprojectState"/>
+ <column name="KIND" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -69,14 +69,14 @@
<column name="DATE_START" valueDate="2019-05-14T11:51:20"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" 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="TYPE" value="SalesprojectState"/>
+ <column name="KIND" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -84,7 +84,7 @@
<column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASESQO"/>
</insert>
@@ -93,7 +93,7 @@
<column name="PARENT_ID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASEMAL"/>
</insert>
@@ -101,7 +101,7 @@
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/>
- <column name="TYPE" value="SalesprojectState"/>
+ <column name="KIND" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
@@ -111,7 +111,7 @@
<column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASEOFFER"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -119,7 +119,7 @@
<column name="PARENT_ID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASENEGO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -127,7 +127,7 @@
<column name="PARENT_ID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASESQO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
@@ -136,7 +136,7 @@
<column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
- <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="KIND" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASEMQC"/>
</insert>
</changeSet>
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 8e380f42b1..a74e8725d2 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml
@@ -9,7 +9,7 @@
<constraints nullable="false"/>
</column>
- <column name="TYPE" type="INTEGER"/>
+ <column name="KIND" type="INTEGER"/>
<column name="VALUE" type="INTEGER"/>
<column name="DATE_START" type="DATETIME"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 39837ae510..da59245361 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -7809,27 +7809,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="80" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Type</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_END</name>
<dbName></dbName>
@@ -7879,6 +7858,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>KIND</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="80" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -9345,20 +9338,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="10" />
- <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 5a0fbf8d66..d3883f0115 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -37,7 +37,7 @@
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>TYPE</name>
+ <name>KIND</name>
<title>Type</title>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
@@ -64,7 +64,7 @@
<expose v="true" />
</entityParameter>
<entityParameter>
- <name>Type_param</name>
+ <name>Kind_param</name>
<expose v="false" />
</entityParameter>
</children>
@@ -89,7 +89,7 @@
</children>
</entityConsumer>
<entityParameter>
- <name>Type_param</name>
+ <name>Kind_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
@@ -105,9 +105,8 @@
</dependencies>
<children>
<entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <name>Kind_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/kind_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityProvider>
@@ -123,9 +122,8 @@
</dependencies>
<children>
<entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <name>Kind_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/kind_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityProvider>
@@ -180,8 +178,8 @@
<recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>SALESPROJECT_MILESTONE.TYPE</recordfield>
+ <name>KIND.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.KIND</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VALUE.value</name>
diff --git a/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/kind_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js
rename to entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/kind_param/valueProcess.js
diff --git a/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/kind_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js
rename to entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/kind_param/valueProcess.js
diff --git a/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js b/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js
index e0aa733ba8..3706bc878d 100644
--- a/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js
@@ -5,7 +5,7 @@ import("Sql_lib");
var cond = SqlCondition.begin()
.andPrepareVars("SALESPROJECT_MILESTONE.SALESPROJECT_ID", "$param.SalesprojectId_param")
- .andPrepareVars("SALESPROJECT_MILESTONE.TYPE", "$param.Type_param");
+ .andPrepareVars("SALESPROJECT_MILESTONE.KIND", "$param.Kind_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index cf89a78d1c..67be10b3c5 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -41,7 +41,7 @@ Salesproject.validateProjectNumber = function(projectNumber) {
* Insert a new milestone.
*
* @param {String} salesprojectId of the salesproject
- * @param {Integer} type can be any value of the keyword SALESPROJECT.MILESTONE.TYPE
+ * @param {Integer} type can be any value of the keyword SALESPROJECT.MILESTONE.KIND
* @param {Integer} value value of the phase or state
* @param {Boolean} [notifyForecast=false] if true, notify user to update the forecast
*
@@ -51,7 +51,7 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
if (KeywordUtils.exists(value, type)) {
var id= db.cell(SqlCondition.begin()
.andPrepare("SALESPROJECT_MILESTONE.SALESPROJECT_ID", salesprojectId)
- .andPrepare("SALESPROJECT_MILESTONE.TYPE", type)
+ .andPrepare("SALESPROJECT_MILESTONE.KIND", type)
.and("SALESPROJECT_MILESTONE.DATE_END is null")
.buildSql("select SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID from SALESPROJECT_MILESTONE "));
@@ -63,13 +63,13 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
[vars.get("$sys.date")],
SqlCondition.begin()
.andPrepare("SALESPROJECT_MILESTONE.SALESPROJECT_ID", salesprojectId)
- .andPrepare("SALESPROJECT_MILESTONE.TYPE", type)
+ .andPrepare("SALESPROJECT_MILESTONE.KIND", type)
.and("SALESPROJECT_MILESTONE.DATE_END is null")
.build("1=2"));
db.insertData(
"SALESPROJECT_MILESTONE",
- ["SALESPROJECT_MILESTONEID", "SALESPROJECT_ID", "TYPE", "VALUE", "DATE_START", "PARENT_ID"],
+ ["SALESPROJECT_MILESTONEID", "SALESPROJECT_ID", "KIND", "VALUE", "DATE_START", "PARENT_ID"],
null,
[util.getNewUUID(), salesprojectId, type, value, vars.get("$sys.date"), id]);
if (notifyForecast) {
--
GitLab