Skip to content
Snippets Groups Projects
Commit 36f904dc authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '1065485_FixLanguageMissingTranslations' into '2020.2.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1065485][Übersetzungen in Languages fehlen]

See merge request xrm/basic!381
parents a7af0695 54b4e82e
No related branches found
No related tags found
No related merge requests found
Showing
with 689 additions and 957 deletions
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="b.ulrich" id="82e86a5a-7796-496e-87ba-4c94ac5e3bb4">
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="restrict"/>
<where>AB_KEYWORD_ENTRYID='4409adc1-0130-44d3-8aa9-773ff3ab0816'</where>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="entity"/>
<where>AB_KEYWORD_ENTRYID='676f498f-3f51-459f-8e07-feec7b604245'</where>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="dataset"/>
<where>AB_KEYWORD_ENTRYID='14f5e2a4-4998-400f-b857-90e14e8736da'</where>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="field"/>
<where>AB_KEYWORD_ENTRYID='d3ae8077-36db-4f52-8f90-b0ebbb6773d7'</where>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="allow"/>
<where>AB_KEYWORD_ENTRYID='27ded05a-99c1-4810-91ee-cbb1e4ddec85'</where>
</update>
</changeSet>
</databaseChangeLog>
......@@ -11,4 +11,5 @@
<include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
<include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
<include relativeToChangelogFile="true" file="alter_VisitrecommendationpriorityDatatype.xml"/>
<include relativeToChangelogFile="true" file="alter_KeywordTitlesForTranslation.xml"/>
</databaseChangeLog>
......@@ -435,7 +435,7 @@
<column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="50"/>
<column name="TITLE" value="ab 1000"/>
<column name="TITLE" value="from 1000"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
......@@ -646,35 +646,35 @@
<column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="10"/>
<column name="TITLE" value="0-49 D€"/>
<column name="TITLE" value="0-49 €"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
<column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
<column name="SCORE" valueNumeric="10.00"/>
<column name="SORT" valueNumeric="30"/>
<column name="TITLE" value="100-199 D€"/>
<column name="TITLE" value="100-199 €"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="733323d6-ff3d-4ccb-b179-ad1fea05dfe8"/>
<column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
<column name="SCORE" valueNumeric="15.00"/>
<column name="SORT" valueNumeric="40"/>
<column name="TITLE" value="200-349 D€"/>
<column name="TITLE" value="200-349 €"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="839cd672-5981-4207-8a82-caddd00107e4"/>
<column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="20"/>
<column name="TITLE" value="50-99 D€"/>
<column name="TITLE" value="50-99 €"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
<column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="50"/>
<column name="TITLE" value="ab 350 D€"/>
<column name="TITLE" value="from 350 €"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
......
= Activity_entity - LinkedObjects
Provides records via ActivityLinks.
Every Activity can have 0..n link-records. This provider can be used to retrieve Activity Records from another object that is linkable.(e.g. get all Activites of a specific contactperson)
\ No newline at end of file
Every Activity can have 0..n link-records. This provider can be used to retrieve Activity Records from another object that is linkable.(e.g. get all Activities of a specific contactperson)
\ No newline at end of file
......@@ -16,7 +16,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
var rowId = vars.get("$param.RowId_param");
if (vars.get("$param.ObjectId_param") == "Person")
{
//in the Person context, all activites linked to the person should be shown, so it is necessary to get all contactIds of that person
//in the Person context, all activities linked to the person should be shown, so it is necessary to get all contactIds of that person
var allPersonRelatedContactIds = newSelect("personContacts.CONTACTID")
.from("CONTACT")
.join("CONTACT", "CONTACT.PERSON_ID = personContacts.PERSON_ID", "personContacts")
......
......@@ -8,7 +8,7 @@ var currentContext = ContextUtils.getCurrentContextId();
var canDelete = new HasLinkedObjectTester()
.andNoEntityRows("BulkMailRecipient_entity", "BulkMailRecipients", {BulkMailId_param : rowId}) //Recipients
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
.validate();
result.string(canDelete);
\ No newline at end of file
......@@ -7,7 +7,7 @@ var rowId = vars.get("$field.CAMPAIGNSTEPID");
var currentContext = ContextUtils.getCurrentContextId();
var canDelete = new HasLinkedObjectTester()
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
.andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : rowId}) //Tasks
.validate();
......
......@@ -677,14 +677,14 @@
</filterExtensionSet>
<filterExtension>
<name>DateStart_filter</name>
<title>Startdatum</title>
<title>Startdate</title>
<contentType>DATE</contentType>
<filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtension>
<filterExtension>
<name>DateEnd_filter</name>
<title>Enddatum</title>
<title>Enddate</title>
<contentType>DATE</contentType>
<filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
......
......@@ -102,7 +102,7 @@
<filterExtensions>
<filterExtension>
<name>groupGroupNameExtension</name>
<title>Gruppenname</title>
<title>Groupname</title>
<contentType>TEXT</contentType>
<filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js</filterValuesProcess>
<filtertype>BASIC</filtertype>
......
......@@ -7,7 +7,7 @@ var rowId = vars.get("$field.PRODUCTID");
var currentContext = ContextUtils.getCurrentContextId();
var canDelete = new HasLinkedObjectTester()
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
.andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : rowId}) //Tasks
.andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "PRODUCT", AssignmentRowId_param : rowId}) //Documents
.validate();
......
......@@ -8,7 +8,7 @@ var currentContext = ContextUtils.getCurrentContextId();
var canDelete = new HasLinkedObjectTester()
.andNoEntityRows("LetterRecipient_entity", "SerialLetterRecipients", {SerialLetterId_param : rowId}) //Recipients
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activiites
.validate();
result.string(canDelete);
\ No newline at end of file
......@@ -2,6 +2,6 @@
For manual linking of an unlinked mail
WARNING: This is deprecated and should not longer be used. Activites are now created always and have some or no activity links.
WARNING: This is deprecated and should not longer be used. Activities are now created always and have some or no activity links.
//todo: remove entity
\ No newline at end of file
Provides a wrapper for Unlinked Mails.
WARNING: This is deprecated and should not longer be used. Activites are now created always and have some or no activity links.
\ No newline at end of file
WARNING: This is deprecated and should not longer be used. Activities are now created always and have some or no activity links.
\ No newline at end of file
......@@ -7,7 +7,7 @@
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="false" />
<titlePlural>Activites</titlePlural>
<titlePlural>Activities</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -18,7 +18,7 @@
<showDrawer v="false" />
<drawerCaption></drawerCaption>
<entityField>#ENTITY</entityField>
<title>Neue Kampagne</title>
<title>New Campaign</title>
<fields>
<entityFieldLink>
<name>df6356cf-e0bd-4947-8163-736301e622cf</name>
......
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>CampaignStepEdit_view</name>
<title>Neuer Kampagnenschritt</title>
<title>New campaign step</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<size>SMALL</size>
<overlayOrientation>PORTRAIT</overlayOrientation>
......
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>LeadimportLeadFilter_view</name>
<title>Transferdaten</title>
<title>Transfer data</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment