diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js index c82efe19555b1d56e35a8e103aecffa015136880..c82b4d748061c5e19bf3bb21588121f5178257c2 100644 --- a/entity/Offer_entity/entityfields/currency/displayValueProcess.js +++ b/entity/Offer_entity/entityfields/currency/displayValueProcess.js @@ -3,8 +3,4 @@ import("system.vars"); import("Keyword_lib"); import("KeywordRegistry_basic"); -if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) -{ - var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$param.OfferCurrency_param")); - result.string(currency); -} \ No newline at end of file +result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY"))); diff --git a/entity/Offer_entity/entityfields/currency/valueProcess.js b/entity/Offer_entity/entityfields/currency/valueProcess.js index 636be1adc9a7505eea4d957860d46a81856f5a93..787ece941a73bd5747239c362d3f0bb9fcc0e439 100644 --- a/entity/Offer_entity/entityfields/currency/valueProcess.js +++ b/entity/Offer_entity/entityfields/currency/valueProcess.js @@ -1,7 +1,12 @@ -import("system.result"); -import("system.vars"); - -if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) -{ - result.string(vars.get("$param.OfferCurrency_param")); +import("system.neon"); +import("system.result"); +import("system.vars"); + +if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) +{ + result.string(vars.get("$param.OfferCurrency_param")); +} +else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) +{ + result.string("EUR"); } \ No newline at end of file diff --git a/entity/Offer_entity/entityfields/language/valueProcess.js b/entity/Offer_entity/entityfields/language/valueProcess.js index 4fc924e18219f6a6b30f4b3ebb8ffb22d8ed3cb0..826184267b67f23cecfd90a51ce0ee526800072a 100644 --- a/entity/Offer_entity/entityfields/language/valueProcess.js +++ b/entity/Offer_entity/entityfields/language/valueProcess.js @@ -1,7 +1,12 @@ -import("system.result"); -import("system.vars"); - -if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param")) -{ - result.string(vars.get("$param.OfferLanguage_param")); +import("system.neon"); +import("system.result"); +import("system.vars"); + +if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param")) +{ + result.string(vars.get("$param.OfferLanguage_param")); +} +else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) +{ + result.string("deu"); } \ No newline at end of file diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js index ea5cc54c968466314db57e5c44b01453da4ff861..7d4ed678a49b3ccfbd5d34fdb892fd6f0c8520a1 100644 --- a/entity/Offer_entity/entityfields/status/valueProcess.js +++ b/entity/Offer_entity/entityfields/status/valueProcess.js @@ -3,4 +3,4 @@ import("system.vars"); import("system.result"); if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) - result.string("25b0ac77-ef92-4809-802e-bb9d8782f865"); //Open \ No newline at end of file + result.string("70d27a1b-7233-481d-826f-01a13a4bb0b2"); //Open \ No newline at end of file diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml index ce858a70d018230f40877955af88b26e8c2cfc5b..19c59bfef3859b3736d8098ec846f1cc25ad3355 100644 --- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml +++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml @@ -1,16 +1,6 @@ <?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="033b6fcb-53d9-4e23-8c29-4e739294a704"> - <insert tableName="AB_KEYWORD_ENTRY"> - <column name="AB_KEYWORD_ENTRYID" value="c6eeab06-cec9-42c3-8f11-468c7e602de4"/> - - <column name="KEYID" value="25b0ac77-ef92-4809-802e-bb9d8782f865"/> - <column name="TITLE" value="Open"/> - <column name="CONTAINER" value="SalesprojectState"/> - <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="115495eb-dff4-436d-8114-b9a7644586bf"/> diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml new file mode 100644 index 0000000000000000000000000000000000000000..91ac25d68ca5821e3ebeb2b69599bfb0783d712d --- /dev/null +++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml @@ -0,0 +1,14 @@ +<?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.veogl" id="3e9548bd-2c3e-413f-a8b0-405d926f2790"> + <insert tableName="AB_KEYWORD_ENTRY"> + <column name="AB_KEYWORD_ENTRYID" value="3c734077-8677-4732-86ef-7df01d9646b3"/> + <column name="KEYID" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/> + <column name="TITLE" value="Open"/> + <column name="CONTAINER" value="OfferStatus"/> + <column name="SORTING" valueNumeric="-1"/> + <column name="ISACTIVE" valueNumeric="1"/> + <column name="ISESSENTIAL" valueNumeric="0"/> + </insert> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml index 00208338853b3fb658497a3fb51fa22182396d5f..2101a04f63a2c84960c475fb8bd31c3e2803f7b0 100644 --- a/others/db_changes/data_alias/basic/2019.2/changelog.xml +++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml @@ -110,4 +110,5 @@ <include relativeToChangelogFile="true" file="AditoBasic/init_ContactPosition.xml"/> <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeKeyword_target_group.xml"/> + <include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/> </databaseChangeLog> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 2e627c2e517e6de8e51a348a72ea341be0d36ca5..35430f5089fee2c2b0e5c87d3278c5f9d34a897c 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0"> <name>_____PREFERENCES_PROJECT</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <projectName>xRM-Basic2019</projectName> + <projectName>xRM-Basic5</projectName> <jditoMaxContentSize v="57671680" /> <calendarCategoriesEvent> <entry>