Skip to content
Snippets Groups Projects
Commit 629d9157 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch 'sales_ScanServiceErrors' into '2021.2.1' 

scanserve warnings and indizes

See merge request xrm/basic!1440
parents 6a106469 9bf5d4f8
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 736 additions and 665 deletions
.liquibase/Data_alias/basic/2021.2.1/MissingIndizes/add_MissingIndizes.xml 0 → 100644
+ 124
− 0
View file @ 629d9157
<?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="7de26c77-92b4-40f0-954d-95828ebdc5f4">
<createIndex tableName="BULKMAIL" indexName="IDX_BULKMAIL_INTEREST_ID">
<column name="INTEREST_ID"/>
</createIndex>
<createIndex tableName="BULKMAIL" indexName="IDX_BULKMAIL_EMPCONTACT_ID">
<column name="EMPLOYEE_CONTACT_ID"/>
</createIndex>
<createIndex tableName="BULKMAIL" indexName="IDX_BULKMAIL_MOSAICOTMPL_ID">
<column name="MOSAICOTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="TICKET" indexName="IDX_TICKET_INBOX_ID">
<column name="INBOX_ID"/>
</createIndex>
<createIndex tableName="TICKET" indexName="IDX_TICKET_MAILSIGNATURE_ID">
<column name="MAILSIGNATURE_ID"/>
</createIndex>
<createIndex tableName="TICKET" indexName="IDX_TICKET_ORDER_ID">
<column name="ORDER_ID"/>
</createIndex>
<createIndex tableName="TICKET" indexName="IDX_TICKET_EDITOR_CONTACT_ID">
<column name="EDITOR_CONTACT_ID"/>
</createIndex>
<createIndex tableName="DISTRICTCONTACT" indexName="IDX_DISTRCONTACT_DISTRRESP_ID">
<column name="DISTRICTRESPONSIBLE_ID"/>
</createIndex>
<createIndex tableName="WEBLINKTAG" indexName="IDX_WEBLINKTAG_WEBLINK_ID">
<column name="WEBLINK_ID"/>
</createIndex>
<createIndex tableName="MAIL_LOG" indexName="IDX_MAIL_LOG_CONTACT_ID">
<column name="CONTACT_ID"/>
</createIndex>
<createIndex tableName="MAIL_RUN" indexName="IDX_MAIL_RUN_OBJECT_ROWID">
<column name="OBJECT_ROWID"/>
</createIndex>
<createIndex tableName="BULKMAILTESTRECIPIENT" indexName="IDX_BULKMAILTESTREC_BULKMAI_ID">
<column name="BULKMAIL_ID"/>
</createIndex>
<createIndex tableName="BULKMAILTESTRECIPIENT" indexName="IDX_BULKMAILTESTREC_CONTACT_ID">
<column name="CONTACT_ID"/>
</createIndex>
<createIndex tableName="WEBLINK_CLICK" indexName="IDX_WEBLINK_CLICK_WEBLINK_ID">
<column name="WEBLINK_ID"/>
</createIndex>
<createIndex tableName="EWS_INFO_LOG" indexName="IDX_EWS_INFO_LOG_USER_ID">
<column name="USER_ID"/>
</createIndex>
<createIndex tableName="ADVERTISINGITEM" indexName="IDX_ADVERTISINGITEM_INFO_PRODUCT_ID">
<column name="PRODUCT_ID"/>
</createIndex>
<createIndex tableName="MAIL_BOUNCE" indexName="IDX_MAIL_BOUNCE_EMFILTHANDL_ID">
<column name="EMAIL_FILTER_HANDLING_ID"/>
</createIndex>
<createIndex tableName="TASKATTENDEES" indexName="IDX_TASKATTENDEES_TASK_ID">
<column name="TASK_ID"/>
</createIndex>
<createIndex tableName="INBOX_EMPLOYEEGROUP_RELATION" indexName="IDX_INBOX_EMPGR_RELAT_EMPGR_ID">
<column name="EMPLOYEEGROUP_ID"/>
</createIndex>
<createIndex tableName="INBOX_EMPLOYEEGROUP_RELATION" indexName="IDX_INBOX_EMPGR_RELAT_INBOX_ID">
<column name="INBOX_ID"/>
</createIndex>
<createIndex tableName="INBOXFILTER" indexName="IDX_INBOXFILTER_INFILTGROUP_ID">
<column name="INBOXFILTERGROUP_ID"/>
</createIndex>
<createIndex tableName="INBOXFILTER" indexName="IDX_INBOXFILTER_TICKETTEMP_ID">
<column name="TICKETTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="INBOXFILTERGROUP_RELATION" indexName="IDX_INBXFILTGRRL_INBXFILTGR_ID">
<column name="INBOXFILTERGROUP_ID"/>
</createIndex>
<createIndex tableName="INBOXFILTERGROUP_RELATION" indexName="IDX_INBXFILTGRRL_INBOX_ID">
<column name="INBOX_ID"/>
</createIndex>
<createIndex tableName="EMPLOYEEGROUP_CONTACT_RELATION" indexName="IDX_EMPGR_CON_REL_EMPGROUP_ID">
<column name="EMPLOYEEGROUP_ID"/>
</createIndex>
<createIndex tableName="EMPLOYEEGROUP_CONTACT_RELATION" indexName="IDX_EMPGR_CON_REL_CONTACT_ID">
<column name="CONTACT_ID"/>
</createIndex>
<createIndex tableName="TICKETTEMPLATE" indexName="IDX_TICKETTEMPLATE_INBOX_ID">
<column name="INBOX_ID"/>
</createIndex>
<createIndex tableName="TICKETTEMPLATE" indexName="IDX_TICKETTEMPLATE_DOCTEMP_ID">
<column name="DOCUMENTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSIGNATURE_INBOX_ID">
<column name="INBOX_ID"/>
</createIndex>
<createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSIGNATURE_DOCTEMP_ID">
<column name="DOCUMENTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSGNTRE_DEF_TICKTEMP_ID">
<column name="DEFAULT_TICKETTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSGNTRE_SIG_DOCTEMP_ID">
<column name="SIGNATURE_DOCUMENTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="ATTRIBUTE_FILTER" indexName="IDX_ATTR_FILT_INBXFILTGR_ID">
<column name="INBOXFILTERGROUP_ID"/>
</createIndex>
<createIndex tableName="EMPLOYEEGROUP_RULEGROUP_RELATION" indexName="IDX_EMPGROULRLREL_EMPGROUP_ID">
<column name="EMPLOYEEGROUP_ID"/>
</createIndex>
<createIndex tableName="EMPLOYEEGROUP_RULEGROUP_RELATION" indexName="IDX_EMPGRLRLREL_EMPRLGROUP_ID">
<column name="EMPLOYEEGROUP_RULEGROUP_ID"/>
</createIndex>
<createIndex tableName="EMPLOYEEGROUP_RULE" indexName="IDX_EMPGRLRULE_EMPRLGROUP_ID">
<column name="EMPLOYEEGROUP_RULEGROUP_ID"/>
</createIndex>
<createIndex tableName="DOCUMENTTEMPLATE_TICKETCATEGORY" indexName="IDX_DOCTEMP_TICKCAT_DOCTEMP_ID">
<column name="DOCUMENTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="SALESORDERLINK" indexName="IDX_SALESORDLINK_OBJECT_ROWID">
<column name="OBJECT_ROWID"/>
</createIndex>
<createIndex tableName="SALESORDERLINK" indexName="IDX_SALESORDLINK_SALESORDER_ID">
<column name="SALESORDER_ID"/>
</createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.2.1/changelog.xml 0 → 100644
+ 5
− 0
View file @ 629d9157
<?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">
<include relativeToChangelogFile="true" file="MissingIndizes/add_MissingIndizes.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/changelog.xml
+ 1
− 0
View file @ 629d9157
......@@ -28,6 +28,7 @@
<include relativeToChangelogFile="true" file="basic/2021.1.2/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.1.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 602
− 602
View file @ 629d9157
This diff is collapsed.
entity/DistrictChangeValidityDates_entity/DistrictChangeValidityDates_entity.aod
+ 0
− 7
View file @ 629d9157
......@@ -32,11 +32,6 @@
<name>DistrictContactIds_param</name>
<expose v="true" />
</entityParameter>
<entityActionField>
<name>safeAndUpdate</name>
<onActionProcess>%aditoprj%/entity/DistrictChangeValidityDates_entity/entityfields/safeandupdate/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CHECK</iconId>
</entityActionField>
<entityField>
<name>count</name>
<title>Contacts selected</title>
......@@ -47,14 +42,12 @@
<title>change valid from</title>
<contentType>BOOLEAN</contentType>
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/DistrictChangeValidityDates_entity/entityfields/setvalid_from/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>setValid_until</name>
<title>change valid to</title>
<contentType>BOOLEAN</contentType>
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/DistrictChangeValidityDates_entity/entityfields/setvalid_until/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>UID</name>
......
entity/Product_entity/recordcontainers/db/recordfieldmappings/statustileview.displayvalue/expression.js deleted 100644 → 0
+ 0
− 5
View file @ 6a106469
import("system.translate");
import("Sql_lib");
import("system.result");
result.string(SqlBuilder.caseWhen(newWhere("PRODUCT.STATUS", 1)).thenString(translate.text("Active")).elseString(translate.text("Inactive")).toString());
\ No newline at end of file
entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+ 2
− 0
View file @ 629d9157
......@@ -106,10 +106,12 @@
<entityActionField>
<name>openPlanning</name>
<onActionProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/openplanning/onActionProcess.js</onActionProcess>
<iconId>VAADIN:MONEY</iconId>
</entityActionField>
<entityActionField>
<name>openForecastWeighted</name>
<onActionProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/openforecastweighted/onActionProcess.js</onActionProcess>
<iconId>VAADIN:BAR_CHART_H</iconId>
</entityActionField>
</entityFields>
<recordContainers>
......
entity/Salesproject_entity/contentDescriptionProcess.js
+ 1
− 1
View file @ 629d9157
......@@ -9,7 +9,7 @@ import("KeywordRegistry_basic");
var res = [translate.text("Phase") + ": " + KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")),
translate.text("Classification: ") + vars.get("$field.CLASSIFICATIONVALUE"),
translate.text("Volume") + ": " + NumberUtils.formatWithCurrency(vars.get("$field.VOLUME"), translate.text("#,##0.00"), "€"),
translate.text("Volume") + ": " + NumberUtils.formatWithCurrency(vars.get("$field.VOLUME"), translate.text("#,##0.00"), "\u20ac"),
translate.text("Probability") + ": " + vars.get("$field.PROBABILITY") + "%",
translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy"))];
......
entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+ 1
− 3
View file @ 629d9157
......@@ -176,7 +176,6 @@
<title>Appointment</title>
<consumer>Appointments</consumer>
<linkedContext>Appointment</linkedContext>
<valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/appointment_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
......@@ -430,7 +429,6 @@
<iconId>VAADIN:HOURGLASS_END</iconId>
<stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/stateProcess.js</stateProcess>
<tooltip>Create Visitreport</tooltip>
<tooltipProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>NewAppointment</name>
......@@ -440,7 +438,6 @@
<iconId>VAADIN:CALENDAR</iconId>
<state>EDITABLE</state>
<tooltip>Create new Appointment</tooltip>
<tooltipProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
</entityActionGroup>
......@@ -499,6 +496,7 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/VisitPlanEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/VisitPlanEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/VisitPlanEntry_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
......
entity/VisitPlanEntry_entity/entityfields/newactivity/documentation.adoc deleted 100644 → 0
+ 0
− 1
View file @ 6a106469
opens the editview of activity with category Visitreport
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/newactivity/onActionProcess.js deleted 100644 → 0
+ 0
− 29
View file @ 6a106469
import("Sql_lib");
import("AttributeRegistry_basic");
import("system.db");
import("KeywordRegistry_basic");
import("Contact_lib");
import("Employee_lib");
import("system.vars");
import("ActivityTask_lib");
var links = [];
var pointOfContact = newSelect("CONTACT.CONTACTID", db.getCurrentAlias())
.from("CONTACT")
.leftJoin("AB_ATTRIBUTERELATION", "CONTACT.CONTACTID = AB_ATTRIBUTERELATION.OBJECT_ROWID")
.leftJoin("AB_ATTRIBUTE", "AB_ATTRIBUTE.AB_ATTRIBUTEID = AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")
.leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
.where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact())
.and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_CONTACT_ID"))
.cell();
if(pointOfContact)
links.push([ContactUtils.getContextByContactId(pointOfContact), pointOfContact]);
else
{
links.push(["Organisation", vars.get("$field.ORGANISATION_CONTACT_ID")]);
links.push(["Person", vars.get("$field.CONTACT_ID")]);
}
ActivityUtils.createNewActivity(null, links, null, null, null, null, $KeywordRegistry.activityDirection$outgoing(), null, $KeywordRegistry.activityCategory$visit(), vars.get("$field.ENTRYDATE"), vars.get("$field.VISITPLANENTRYID"));
entity/VisitPlanEntry_entity/entityfields/newactivity/stateProcess.js deleted 100644 → 0
+ 0
− 13
View file @ 6a106469
import("system.datetime");
import("system.result");
import("system.vars");
import("system.neon");
var state = neon.COMPONENTSTATE_DISABLED;
var today = vars.get("$sys.date")
if (vars.get("$field.ENTRYDATE") <= today && vars.get("$sys.selectionRows") != "")
{
state = neon.COMPONENTSTATE_EDITABLE;
}
result.string(state);
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/newactivity/tooltipProcess.js deleted 100644 → 0
+ 0
− 4
View file @ 6a106469
import("system.translate");
import("system.result");
result.string(translate.text("Create Visitreport"));
\ No newline at end of file
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