Skip to content
Snippets Groups Projects
Commit ef23bc96 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/Feature_1034865 into update-Liwuibase-structure 

Conflicts:
	others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
parents fe84a849 1ba97047
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 104 deletions
entity/Task_entity/Task_entity.aod
+ 3
− 1
View file @ ef23bc96
......@@ -77,7 +77,9 @@
<name>TYPE</name>
<title>type</title>
<consumer>KeywordTypes</consumer>
<groupable v="true" />
<searchable v="false" />
<groupable v="false" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
......
entity/Task_entity/entityfields/type/valueProcess.js 0 → 100644
+ 4
− 0
View file @ ef23bc96
import("system.result");
// Sets the type to "Task" as default value.
result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7");
\ No newline at end of file
neonView/TaskEdit_view/TaskEdit_view.aod
+ 0
− 4
View file @ ef23bc96
......@@ -37,10 +37,6 @@
<name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
<entityField>PRIORITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8173056f-fac6-4ee0-a8ff-c27c8184e6e9</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
<entityField>PROTECTIONLEVEL</entityField>
......
neonView/TaskMain_view/TaskMain_view.aod
+ 0
− 4
View file @ ef23bc96
......@@ -24,10 +24,6 @@
<name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
<entityField>PROTECTIONLEVEL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e73dda40-22cd-4d2d-abcf-c7fc59ea2e67</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>fea59f13-750b-427d-bf33-cc1bead95446</name>
<entityField>DESCRIPTION</entityField>
......
neonView/TaskPreview_view/TaskPreview_view.aod
+ 0
− 4
View file @ ef23bc96
......@@ -40,10 +40,6 @@
<name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
<entityField>PROTECTIONLEVEL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5bcbaa89-0826-4ef8-872d-bd68dbd8ef77</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
<entityField>REQUESTOR_CONTACT_ID</entityField>
......
others/db_changes/data_alias/changes/changelog.xml
+ 1
− 1
View file @ ef23bc96
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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">
<include relativeToChangelogFile="true" file="2019.2/update_TaskType_Task.xml"/>
</databaseChangeLog>
others/db_changes/data_alias/changes/update_TaskType_Task.xml 0 → 100644
+ 84
− 0
View file @ ef23bc96
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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="a.loreth" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
<column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="TITLE" value="Task"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="54231fc1-050e-4f00-91e1-4968387a6370" />
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b" />
</whereParams>
</delete>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
</whereParams>
</delete>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
<column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
<column name="TITLE" value="Visit"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
<column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
<column name="TITLE" value="E-Mail"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
<column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
<column name="TITLE" value="Phone"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
<column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
<column name="TITLE" value="Online-Meeting"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml deleted 100644 → 0
+ 0
− 35
View file @ fe84a849
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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="f.feldmann" id="653af1f7-c0b9-4544-a93c-f3bf1e3ad054">
<insert tableName="SALESORDER">
<column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1004"/>
<column name="VERSNR" valueNumeric="1"/>
<column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
<column name="NET" valueNumeric="840.00"/>
<column name="VAT" valueNumeric="159.60"/>
<column name="CURRENCY" value="EUR"/>
<column name="LANGUAGE" value="deu"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
<column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
<column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="ITEMNAME" value="AX45"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMPOSITION" value="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
others/db_changes/data_alias/init/changelog.xml
+ 0
− 4
View file @ ef23bc96
......@@ -44,8 +44,4 @@
<include relativeToChangelogFile="true" file="data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
<include relativeToChangelogFile="true" file="data/AditoBasic/init_ab_language.xml"/>
<changeSet author="j.hoermann" id="7891e75b-8aa2-488a-8473-fb93678c8c42">
<tagDatabase tag="2019.1"/>
</changeSet>
</databaseChangeLog>
others/db_changes/data_alias/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
+ 5
− 50
View file @ ef23bc96
......@@ -2,64 +2,19 @@
<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.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
<column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
<column name="TITLE" value="Visit"/>
<column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
<column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="TITLE" value="Task"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
<column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
<column name="TITLE" value="E-Mail"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
<column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
<column name="TITLE" value="Phone"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
<column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
<column name="TITLE" value="Online-Meeting"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="54231fc1-050e-4f00-91e1-4968387a6370"/>
</whereParams>
</delete>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
<where>CONTAINER = ?</where>
<whereParams>
<param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
<param value="TaskType"/>
</whereParams>
</delete>
</rollback>
......
others/db_changes/data_alias/update.xml
+ 0
− 1
View file @ ef23bc96
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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">
<include file="init.xml"/>
<include file="changes/changelog.xml"/>
</databaseChangeLog>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment