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

Merge branch '2021.2' into 'master' 

2021.2 > master

See merge request xrm/basic!1449
parents e86216b3 1adbecb7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 90 deletions
entity/Person_entity/recordcontainers/db/recordfieldmappings/contenttitle.value/expression.js
+ 1
− 1
View file @ 16562a04
......@@ -15,7 +15,7 @@ if (db.getDatabaseType(db.getCurrentAlias()) == db.DBTYPE_DERBY10)
}
else
{
contenttitleSQL = Contacttils.getContactSalutationSubSql(true);
contenttitleSQL = ContactUtils.getContactSalutationSubSql(true);
}
result.string(contenttitleSQL);
\ No newline at end of file
entity/Person_entity/recordcontainers/db/recordfieldmappings/orders/filterConditionProcess.js
+ 2
− 2
View file @ 16562a04
......@@ -2,14 +2,14 @@ import("system.vars");
import("Sql_lib");
import("system.result");
result.string(newWhere("CONTACT.CONTACT_ID",
result.string(newWhere("CONTACT.CONTACTID",
newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
.from("CAMPAIGN")
.join("CAMPAIGNPARTICIPANT",
newWhere("CAMPAIGN.CAMPAIGNID = CAMPAIGNPARTICIPANT.CAMPAIGN_ID"))
.whereIfSet(vars.get("$local.condition")),
SqlBuilder.IN())
.orIfSet("CONTACT.CONTACT_ID",
.orIfSet("CONTACT.CONTACTID",
newSelect("CAMPAIGN.EMPLOYEE_CONTACT_ID")
.from("CAMPAIGN")
.whereIfSet(vars.get("$local.condition")),
......
entity/Person_entity/recordcontainers/db/recordfieldmappings/tasks/filterConditionProcess.js
+ 2
− 3
View file @ 16562a04
......@@ -2,13 +2,12 @@ import("system.vars");
import("Sql_lib");
import("system.result");
result.string(newWhere("CONTACT.CONTACT_ID",
result.string(newWhere("CONTACT.CONTACTID",
newSelect("TASK.REQUESTOR_CONTACT_ID")
.from("TASK")
.whereIfSet(vars.get("$local.condition")),
SqlBuilder.IN())
.orIfSet("CONTACT.CONTACT_ID",
.orIfSet("CONTACT.CONTACTID",
newSelect("TASK.EDITOR_CONTACT_ID")
.from("TASK")
.whereIfSet(vars.get("$local.condition")),
......
entity/Product_entity/recordcontainers/db/recordfieldmappings/statustileview.displayvalue/expression.js deleted 100644 → 0
+ 0
− 5
View file @ e86216b3
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 @ 16562a04
......@@ -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 @ 16562a04
......@@ -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/SlaveAdministrationIntervall_entity/SlaveAdministrationIntervall_entity.aod
+ 1
− 0
View file @ 16562a04
......@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<grantCreate v="false" />
<grantDelete v="false" />
<recordContainer>dbless</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
......
entity/SupportTicket_entity/entityfields/pullnextticket/onActionProcess.js
+ 2
− 2
View file @ 16562a04
......@@ -36,9 +36,9 @@ if(reopenTicket.length > 0) // reopen-Ticket is available
else
{
var myRules = new SqlBuilder()
.selectDistinct("EMPLOYEEGROUP.COND")
.selectDistinct("EMPLOYEEGROUP_RULE.COND")
.from("EMPLOYEEGROUP")
.join("EMPLOYEEGROUP_CONTACT_RELATION","EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID = employeegroup.EMPLOYEEGROUPID")
.join("EMPLOYEEGROUP_CONTACT_RELATION","EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID = EMPLOYEEGROUP.EMPLOYEEGROUPID")
.join("EMPLOYEEGROUP_RULEGROUP_RELATION","EMPLOYEEGROUP.EMPLOYEEGROUPID = EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_ID")
.join("EMPLOYEEGROUP_RULEGROUP","EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID = EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_RULEGROUP_ID")
.join("EMPLOYEEGROUP_RULE","EMPLOYEEGROUP_RULE.EMPLOYEEGROUP_RULEGROUP_ID = EMPLOYEEGROUP_RULEGROUP.EMPLOYEEGROUP_RULEGROUPID")
......
entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+ 1
− 3
View file @ 16562a04
......@@ -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 @ e86216b3
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 @ e86216b3
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 @ e86216b3
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 @ e86216b3
import("system.translate");
import("system.result");
result.string(translate.text("Create Visitreport"));
\ No newline at end of file
entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js deleted 100644 → 0
+ 0
− 6
View file @ e86216b3
import("system.result");
import("Sql_lib");
var cond = SqlMaskingUtils.prototype.isNull("WEBLINK.USER_EDIT", "WEBLINK.USER_NEW");
result.string(cond);
\ No newline at end of file
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 6
− 2
View file @ 16562a04
......@@ -7447,11 +7447,11 @@
</entry>
<entry>
<key>USER_NEW</key>
<value>USER_NEW</value>
<value>Ersteller</value>
</entry>
<entry>
<key>USER_EDIT</key>
<value>USER_EDIT</value>
<value>Bearbeiter</value>
</entry>
<entry>
<key>Mailing to customer</key>
......@@ -14620,6 +14620,10 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Use all serviceticket categories</key>
</entry>
<entry>
<key>Manual resynchronization</key>
<value>Manuelle Neusynchronisation</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
neonContext/Activity/Activity.aod
+ 0
− 6
View file @ 16562a04
......@@ -49,12 +49,6 @@
<name>6bd90850-7818-4187-8518-1172c9fb92ad</name>
<view>ActivityNoteEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>90a403ad-675e-4451-9469-9737da372f92</name>
</neonViewReference>
<neonViewReference>
<name>bd646a45-5e47-4d89-aa62-3c213beda7b7</name>
</neonViewReference>
<neonViewReference>
<name>7e84a9f7-03b0-4da7-88ce-fda1280d44ce</name>
<view>ActivityAdvertising_view</view>
......
neonContext/Advertising/Advertising.aod
+ 0
− 3
View file @ 16562a04
......@@ -25,9 +25,6 @@
<name>7d17d65a-30c9-4041-ac9a-ee60f1ae6c58</name>
<view>AdvertisingMain_view</view>
</neonViewReference>
<neonViewReference>
<name>ebb1f862-1b3d-46c0-ad8b-f06a1c14954d</name>
</neonViewReference>
<neonViewReference>
<name>980e7357-9728-4511-bd0a-3624320118e7</name>
<view>AdvertisingDetail_view</view>
......
neonContext/AdvertisingItem/AdvertisingItem.aod
+ 0
− 6
View file @ 16562a04
......@@ -12,16 +12,10 @@
<name>03ebbae0-0f94-41b2-ae92-d5e1bb54a715</name>
<view>AdvertisingItemEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>af7ddf8c-3e2b-4740-bfef-b8c81d2f0f64</name>
</neonViewReference>
<neonViewReference>
<name>ec8a27af-0d20-41e8-925d-45c2f1bdfa54</name>
<view>AdvertisingItemPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>27c97161-8929-4f5d-a8af-e7f4f56ae22b</name>
</neonViewReference>
<neonViewReference>
<name>a2fe9312-f4b7-421a-ac6d-19a07033d9bd</name>
<view>AdvertisingItemFilter_view</view>
......
neonContext/Classification/Classification.aod
+ 0
− 3
View file @ 16562a04
......@@ -10,8 +10,5 @@
<name>3ab6b4d1-e6db-42be-8262-2499a3d114e9</name>
<view>ClassificationTree_view</view>
</neonViewReference>
<neonViewReference>
<name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
</neonViewReference>
</references>
</neonContext>
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