Skip to content
Snippets Groups Projects
Commit b2bd8864 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '1067252_FixActivityNewOfferLinks' into '2020.2' 

[Projekt: Entwicklung - xRM][TicketNr.: 1067252][Aktivität - Preview - neues...

See merge request xrm/basic!552
parents c2a14760 52e410a0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
entity/Activity_entity/entityfields/newoffer/onActionProcess.js
+ 44
− 1
View file @ b2bd8864
import("Sql_lib");
import("system.vars");
import("Offer_lib");
OfferUtils.createNewOffer(null, null, null, vars.get("$field.ACTIVITYID"));
\ No newline at end of file
var activityId = vars.get("$field.ACTIVITYID");
var relevantLinks = newSelect("ACTIVITYLINK.OBJECT_TYPE, ACTIVITYLINK.OBJECT_ROWID")
.from("ACTIVITYLINK")
.where("ACTIVITYLINK.ACTIVITY_ID", activityId)
.and((newWhere("ACTIVITYLINK.OBJECT_TYPE", "Organisation"))
.or("ACTIVITYLINK.OBJECT_TYPE", "Salesproject")
.or("ACTIVITYLINK.OBJECT_TYPE", "Person"))
.orderBy("ACTIVITYLINK.OBJECT_TYPE")
.table();
var previousObjectType = "";
var linksForInitialising = {};
var relationId = null;
//if we only have one Person: that person is the contact.
//otherwise: we check for organisations: if we only have one then we use that one.
//same logic for salesprojects: if we have only one: use that one
for (let i = 0; i < relevantLinks.length; i++)
{
if(!linksForInitialising.hasOwnProperty(relevantLinks[i][0]))
{
linksForInitialising[relevantLinks[i][0]] = relevantLinks[i][1]
}
else
{
linksForInitialising[relevantLinks[i][0]] = null;
}
}
if(linksForInitialising["Person"])
{
relationId = linksForInitialising["Person"];
}
if(linksForInitialising["Organisation"] && relationId == null)
{
relationId = linksForInitialising["Organisation"];
}
if(linksForInitialising["Salesproject"])
{
salesprojectId = linksForInitialising["Salesproject"];
}
OfferUtils.createNewOffer("Salesproject", salesprojectId, relationId, vars.get("$field.ACTIVITYID"));
\ No newline at end of file
entity/Offer_entity/Offer_entity.aod
+ 119
− 119
View file @ b2bd8864
......@@ -117,11 +117,6 @@
<name>Offeritems</name>
<refreshParent v="true" />
<description></description>
<dependency>
<name>dependency</name>
<entityName>Offeritem_entity</entityName>
<fieldName>OfferItems</fieldName>
</dependency>
<children>
<entityParameter>
<name>OfferId_param</name>
......@@ -151,6 +146,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Offeritem_entity</entityName>
<fieldName>OfferItems</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newOfferVersion</name>
......@@ -247,27 +247,22 @@
</entityField>
<entityConsumer>
<name>AnyContacts</name>
<dependency>
<name>dependency</name>
<entityName>AnyContact_entity</entityName>
<fieldName>OnlySameCompany</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AnyContact_entity</entityName>
<fieldName>OnlySameCompany</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>Documents</fieldName>
</dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
......@@ -278,15 +273,15 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>MainDocuments</fieldName>
<fieldName>Documents</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
......@@ -297,6 +292,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>MainDocuments</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>ADDRESS</name>
......@@ -323,11 +323,6 @@
</entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -335,14 +330,14 @@
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordOfferStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordOfferStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -350,6 +345,11 @@
<expose v="false" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newOrder</name>
......@@ -367,11 +367,6 @@
</entityConsumer>
<entityConsumer>
<name>KeywordProbabilities</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -379,14 +374,14 @@
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
......@@ -401,6 +396,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
......@@ -412,26 +412,6 @@
</entityActionField>
<entityProvider>
<name>ContactOffers</name>
<dependencies>
<entityDependency>
<name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
<entityName>Person_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
<entityName>Organisation_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
<entityName>Order_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
......@@ -482,6 +462,26 @@
<expose v="false" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
<entityName>Person_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
<entityName>Organisation_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
<entityName>Order_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>OfferCurrency_param</name>
......@@ -551,40 +551,35 @@
</entityField>
<entityConsumer>
<name>KeywordPaymentTerm</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordDeliveryTerm</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordDeliveryTerm</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>Tasks</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
......@@ -599,6 +594,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>Tasks</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>INFO</name>
......@@ -610,11 +610,6 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
......@@ -625,6 +620,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>AttributeRelations</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>OfferPaymentTerm_param</name>
......@@ -664,17 +664,17 @@
</entityField>
<entityConsumer>
<name>PossibleAddresses</name>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
<fieldName>OrganisationAndContactAddresses</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
<fieldName>OrganisationAndContactAddresses</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>ChoosenTEXHeader</name>
......@@ -716,11 +716,6 @@
</entityField>
<entityConsumer>
<name>Objects</name>
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
<fieldName>FilteredObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
......@@ -731,14 +726,14 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>Exclusive</fieldName>
<entityName>Object_entity</entityName>
<fieldName>FilteredObjects</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
<children>
<entityParameter>
<name>Blacklist_param</name>
......@@ -749,18 +744,15 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>Exclusive</fieldName>
</dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>OfferDeliveryTerm_param</name>
......@@ -816,6 +808,14 @@
<expose v="false" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>ObjectRowId_param</name>
......@@ -833,11 +833,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTexHeader</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
......@@ -848,20 +843,25 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>FOOTER</name>
......@@ -888,11 +888,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTexFooter</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
......@@ -903,20 +898,25 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Salesprojects</fieldName>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Salesprojects</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
......
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