Merge origin/master

others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml

+<?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="j.goderbauer" id="25ab05e0-51a9-4f6b-ae62-83d0583aef3b">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ab44bd2c-dffa-4731-8a24-fad31f069c46"/>
+      <column name="KEYID" value="c5bfa55e-4e9b-4d57-88e1-e06dedb71764"/>
+      <column name="TITLE" value="0 %"/>
+      <column name="CONTAINER" value="SalesprojectProbability"/>
+      <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="e59169d3-c0d9-4718-b8b6-e315857948a0"/>
+      <column name="KEYID" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+      <column name="TITLE" value="25 %"/>
+      <column name="CONTAINER" value="SalesprojectProbability"/>
+      <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="415f1cf0-8c5b-4b6e-9900-0d0d6d72381c"/>
+      <column name="KEYID" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+      <column name="TITLE" value="50 %"/>
+      <column name="CONTAINER" value="SalesprojectProbability"/>
+      <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="6182cc48-df2b-4ba9-893a-bcedfd0e1e4b"/>
+      <column name="KEYID" value="67576cf1-29b3-4832-b8fe-9c7913e34ff4"/>
+      <column name="TITLE" value="75 %"/>
+      <column name="CONTAINER" value="SalesprojectProbability"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f5b601a5-451b-4ab6-9167-b95077e90c62"/>
+      <column name="KEYID" value="ea30b4c3-1767-458a-98a4-2553c25fc5f9"/>
+      <column name="TITLE" value="100 %"/>
+      <column name="CONTAINER" value="SalesprojectProbability"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <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="ab44bd2c-dffa-4731-8a24-fad31f069c46"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="e59169d3-c0d9-4718-b8b6-e315857948a0"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="415f1cf0-8c5b-4b6e-9900-0d0d6d72381c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="6182cc48-df2b-4ba9-893a-bcedfd0e1e4b"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f5b601a5-451b-4ab6-9167-b95077e90c62"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

others/db_changes/masterChangelog.xml

@@ -73,8 +73,9 @@
     <include file="data_alias/data/example_salesorder/SALESORDER_1004.xml"/>  
     <include file="data_alias/data/example_task/base.xml"/>
     
-    <!--reference file for keywords:--> 
+    <!--reference files for keywords:--> 
     <include file="data_alias/data/AditoBasic/ab_keyword_entry.xml"/>
+    <include file="data_alias/data/AditoBasic/ab_keyword_attribute.xml"/>
     <!--special case countryinfo data-->
     <include file="data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
 

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>xRM-Basic2019</projectName>
+  <projectName>basic 2019</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>

process/Keyword_lib/process.js

@@ -44,6 +44,7 @@ $KeywordRegistry.get = {
     SalesorderState: "SalesorderState",
     SalesprojectWonLost: "SalesprojectWonLost",
     StockWarehouse: "StockWarehouse",
+    SalesprojectProbability: "SalesprojectProbability",
     
     "null": null
 };