From fe910964985c56ac2de8bd3dd3806827036ab662 Mon Sep 17 00:00:00 2001 From: Markus Escher <m.escher@adito.de> Date: Tue, 12 Mar 2019 08:55:35 +0100 Subject: [PATCH] Revert "upgrade Datamodels" This reverts commit 5df656c9cdcf4071909bd3c258f8a0a7519fb23e. --- .../ActivityLink_entity.aod | 3 ++- entity/Activity_entity/Activity_entity.aod | 13 +++++++++- entity/Address_entity/Address_entity.aod | 6 ++++- .../AnyContact_entity/AnyContact_entity.aod | 6 ++++- .../AppointmentLink_entity.aod | 3 ++- .../Appointment_entity/Appointment_entity.aod | 5 +++- .../AttributeRelation_entity.aod | 5 +++- .../AttributeUsage_entity.aod | 2 +- entity/Attribute_entity/Attribute_entity.aod | 6 ++++- .../Communication_entity.aod | 9 ++++--- .../{valueProcess.js => code.js} | 0 .../{valueProcess.js => code.js} | 0 entity/Context_entity/Context_entity.aod | 2 +- entity/Contract_entity/Contract_entity.aod | 15 ++++++++++- entity/Countries_Entity/Countries_Entity.aod | 4 ++- entity/Document_entity/Document_entity.aod | 3 ++- entity/Gender_keyword/Gender_keyword.aod | 2 +- .../KeywordAttributeRelation_entity.aod | 6 +++-- .../{valueProcess.js => code.js} | 0 .../KeywordAttribute_entity.aod | 3 ++- .../KeywordEntry_entity.aod | 6 +++-- .../{valueProcess.js => code.js} | 0 entity/Language_entity/Language_entity.aod | 2 +- .../ModuleTree_entity/ModuleTree_entity.aod | 2 +- .../ObjectRelation_entity.aod | 7 +++-- .../{valueProcess.js => code.js} | 0 entity/Object_entity/Object_entity.aod | 2 +- entity/Offer_entity/Offer_entity.aod | 17 +++++++++++- entity/Offeritem_entity/Offeritem_entity.aod | 4 ++- entity/Options_Entity/Options_Entity.aod | 2 +- entity/Order_entity/Order_entity.aod | 16 +++++++++++- entity/Orderitem_entity/Orderitem_entity.aod | 4 ++- .../Organisation_entity.aod | 26 ++++++++++++++++++- entity/Person_entity/Person_entity.aod | 21 ++++++++++++++- entity/Prod2prod_entity/Prod2prod_entity.aod | 2 +- entity/Product_entity/Product_entity.aod | 18 ++++++++++++- .../Productprice_entity.aod | 4 ++- ...SalesprojectClassificationEntry_entity.aod | 2 +- .../SalesprojectClassification_entity.aod | 4 ++- .../SalesprojectCompetition_entity.aod | 12 ++++++++- .../SalesprojectCycle_entity.aod | 2 +- .../SalesprojectForecast_entity.aod | 3 ++- .../SalesprojectMember_entity.aod | 4 ++- .../SalesprojectSource_entity.aod | 3 ++- .../Salesproject_entity.aod | 22 +++++++++++++++- entity/Social_entity/Social_entity.aod | 2 +- entity/Stock_entity/Stock_entity.aod | 3 ++- entity/Task_entity/Task_entity.aod | 10 ++++++- .../Timetracking_entity.aod | 2 +- entity/Turnover_entity/Turnover_entity.aod | 6 ++--- .../{valueProcess.js => code.js} | 0 .../{valueProcess.js => code.js} | 0 52 files changed, 249 insertions(+), 52 deletions(-) rename entity/Communication_entity/entityfields/commmediumids_param/{valueProcess.js => code.js} (100%) rename entity/Communication_entity/entityfields/contactsmaincountry_param/{valueProcess.js => code.js} (100%) rename entity/KeywordAttributeRelation_entity/entityfields/containername_param/{valueProcess.js => code.js} (100%) rename entity/KeywordEntry_entity/entityfields/onlyactives_param/{valueProcess.js => code.js} (100%) rename entity/ObjectRelation_entity/entityfields/providertype_param/{valueProcess.js => code.js} (100%) rename entity/Turnover_entity/entityfields/maxyear_param/{valueProcess.js => code.js} (100%) rename entity/Turnover_entity/entityfields/yearcounttoshow_param/{valueProcess.js => code.js} (100%) diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod index 4c1f4fdf45..bf6bac7e1b 100644 --- a/entity/ActivityLink_entity/ActivityLink_entity.aod +++ b/entity/ActivityLink_entity/ActivityLink_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>ActivityLink_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <recordContainer>db</recordContainer> @@ -62,6 +62,7 @@ <children> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod index 9156f47d7b..f0024a83bf 100644 --- a/entity/Activity_entity/Activity_entity.aod +++ b/entity/Activity_entity/Activity_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Activity_entity</name> <title>Activity</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -98,12 +98,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -119,12 +122,15 @@ <children> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -156,6 +162,7 @@ <children> <entityParameter> <name>ActivityId_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/code.js</code> <expose v="true" /> </entityParameter> </children> @@ -171,6 +178,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -261,9 +269,11 @@ <children> <entityParameter> <name>ContextName</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js</code> </entityParameter> <entityParameter> <name>ID</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id/code.js</code> </entityParameter> </children> </entityConsumer> @@ -314,6 +324,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Activity_entity/entityfields/keywordcategory/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod index 2392409422..e1dd74e5b3 100644 --- a/entity/Address_entity/Address_entity.aod +++ b/entity/Address_entity/Address_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Address_entity</name> <title>Addresses</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -83,6 +83,7 @@ <children> <entityParameter> <name>ContactType_param</name> + <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code> <expose v="true" /> <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description> </entityParameter> @@ -117,6 +118,7 @@ <children> <entityParameter> <name>ContactType_param</name> + <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description> @@ -159,6 +161,7 @@ <children> <entityParameter> <name>ContactType_param</name> + <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code> <expose v="true" /> <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description> </entityParameter> @@ -195,6 +198,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod index 95e281ecf4..179c872d48 100644 --- a/entity/AnyContact_entity/AnyContact_entity.aod +++ b/entity/AnyContact_entity/AnyContact_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>AnyContact_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess> @@ -71,6 +71,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/ContactId_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -85,6 +86,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/organisation/children/ContactId_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -116,6 +118,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/emailcommunications/children/contactid_param/code.js</code> <expose v="false" /> </entityParameter> </children> @@ -131,6 +134,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/phonecommunications/children/contactid_param/code.js</code> <expose v="false" /> </entityParameter> </children> diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod index 0c2f7e188d..88950dc8c8 100644 --- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod +++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>AppointmentLink_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <recordContainer>db</recordContainer> @@ -74,6 +74,7 @@ <children> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index ce5b73f61c..632ee34458 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Appointment_entity</name> <title>Termin</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -155,6 +155,7 @@ <children> <entityParameter> <name>AppointmentId_param</name> + <code>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -169,6 +170,7 @@ <children> <entityParameter> <name>ContextId_param</name> + <code>%aditoprj%/entity/Appointment_entity/entityfields/contexts/children/contextid_param/code.js</code> <documentation>%aditoprj%/entity/Appointment_entity/entityfields/contexts/children/contextid_param/documentation.adoc</documentation> </entityParameter> </children> @@ -184,6 +186,7 @@ <children> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/Appointment_entity/entityfields/objects/children/objecttype_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod index 31485b4533..b585ba84eb 100644 --- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod +++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>AttributeRelation_entity</name> <title>Attribute Relation</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -148,6 +148,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -171,11 +172,13 @@ <children> <entityParameter> <name>objectType_param</name> + <code>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>filteredAttributeIds_param</name> + <code>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod index 52b0452a52..0b86ccf621 100644 --- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod +++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>AttributeUsage_entity</name> <title>Attribute Usage</title> <majorModelMode>DISTRIBUTED</majorModelMode> diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod index 5da6c60b02..e1f914dbd9 100644 --- a/entity/Attribute_entity/Attribute_entity.aod +++ b/entity/Attribute_entity/Attribute_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Attribute_entity</name> <title>Attribute</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -53,11 +53,13 @@ <children> <entityParameter> <name>attrParentId_param</name> + <code>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js</code> <triggerRecalculation v="true" /> <mandatory v="false" /> </entityParameter> <entityParameter> <name>attrParentType_param</name> + <code>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -98,6 +100,7 @@ <children> <entityParameter> <name>attributeId_param</name> + <code>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -120,6 +123,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod index 9cc1e9c618..30793c5263 100644 --- a/entity/Communication_entity/Communication_entity.aod +++ b/entity/Communication_entity/Communication_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Communication_entity</name> <title>Communication</title> <description>former Comm</description> @@ -50,7 +50,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact </entityProvider> <entityParameter> <name>ContactsMainCountry_param</name> - <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js</code> <mandatory v="false" /> <description>PARAMETER</description> </entityParameter> @@ -113,6 +113,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>CommCategory_param</name> + <code>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code> <expose v="true" /> <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description> </entityParameter> @@ -151,6 +152,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>CommCategory_param</name> + <code>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code> <expose v="true" /> <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description> </entityParameter> @@ -169,7 +171,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact </entityParameter> <entityParameter> <name>CommMediumIds_param</name> - <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/code.js</code> <triggerRecalculation v="true" /> <description>PARAMETER</description> </entityParameter> @@ -184,6 +186,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Communication_entity/entityfields/keywordmedium/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js b/entity/Communication_entity/entityfields/commmediumids_param/code.js similarity index 100% rename from entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js rename to entity/Communication_entity/entityfields/commmediumids_param/code.js diff --git a/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js b/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js similarity index 100% rename from entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js rename to entity/Communication_entity/entityfields/contactsmaincountry_param/code.js diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod index ba84fe0c8b..1f8378aaf3 100644 --- a/entity/Context_entity/Context_entity.aod +++ b/entity/Context_entity/Context_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Context_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation> diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod index ae1bd26215..50bea07aae 100644 --- a/entity/Contract_entity/Contract_entity.aod +++ b/entity/Contract_entity/Contract_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Contract_entity</name> <title>Contract</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -140,9 +140,11 @@ <children> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/code.js</code> </entityParameter> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -177,14 +179,17 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentname_param/code.js</code> <triggerRecalculation v="false" /> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> <triggerRecalculation v="false" /> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/code.js</code> <triggerRecalculation v="false" /> </entityParameter> </children> @@ -201,12 +206,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -221,6 +229,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -235,6 +244,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -249,6 +259,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -271,11 +282,13 @@ <children> <entityParameter> <name>objectType_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>objectRowId_param</name> + <code>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod index d386837c6d..105481d336 100644 --- a/entity/Countries_Entity/Countries_Entity.aod +++ b/entity/Countries_Entity/Countries_Entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Countries_Entity</name> <title>Countries</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -33,10 +33,12 @@ <children> <entityParameter> <name>Key_param</name> + <code>%aditoprj%/entity/Countries_Entity/entityfields/iso2_name/children/key_param/code.js</code> <expose v="false" /> </entityParameter> <entityParameter> <name>Value_param</name> + <code>%aditoprj%/entity/Countries_Entity/entityfields/iso2_name/children/value_param/code.js</code> <expose v="false" /> </entityParameter> </children> diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod index 0d0a94e1af..210404deb6 100644 --- a/entity/Document_entity/Document_entity.aod +++ b/entity/Document_entity/Document_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Document_entity</name> <title>Document</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -237,6 +237,7 @@ <children> <entityParameter> <name>Keyword_param</name> + <code>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/code.js</code> <expose v="true" /> <mandatory v="true" /> <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description> diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod index 9447d448ed..e35660701c 100644 --- a/entity/Gender_keyword/Gender_keyword.aod +++ b/entity/Gender_keyword/Gender_keyword.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Gender_keyword</name> <majorModelMode>DISTRIBUTED</majorModelMode> <titleProcess>%aditoprj%/entity/Gender_keyword/titleProcess.js</titleProcess> diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod index d69bf9b452..670f20a09c 100644 --- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod +++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>KeywordAttributeRelation_entity</name> <title>Keyword Attribute Values</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -60,7 +60,7 @@ </entityProvider> <entityParameter> <name>containerName_param</name> - <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js</code> <triggerRecalculation v="true" /> <mandatory v="false" /> <description>PARAMETER</description> @@ -76,9 +76,11 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/code.js</code> </entityParameter> <entityParameter> <name>filterAlreadyUsedByEntryId_param</name> + <code>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js similarity index 100% rename from entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js rename to entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod index a422a17630..e1079bb8c8 100644 --- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod +++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>KeywordAttribute_entity</name> <title>Keyword Attribute</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -82,6 +82,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/KeywordAttribute_entity/entityfields/keywordkeywordattributetypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod index 090c9c4991..de0bacc7b2 100644 --- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod +++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>KeywordEntry_entity</name> <title>Keyword</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -346,6 +346,7 @@ <children> <entityParameter> <name>onlyActives_param</name> + <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/code.js</code> <expose v="true" /> </entityParameter> <entityParameter> @@ -360,7 +361,7 @@ </entityField> <entityParameter> <name>onlyActives_param</name> - <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <description>PARAMETER</description> @@ -377,6 +378,7 @@ <children> <entityParameter> <name>keywordEntryId_param</name> + <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js b/entity/KeywordEntry_entity/entityfields/onlyactives_param/code.js similarity index 100% rename from entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js rename to entity/KeywordEntry_entity/entityfields/onlyactives_param/code.js diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod index 29207002f6..f6202420ad 100644 --- a/entity/Language_entity/Language_entity.aod +++ b/entity/Language_entity/Language_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Language_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <titleProcess>%aditoprj%/entity/Language_entity/titleProcess.js</titleProcess> diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod index 8aff9b18a1..c23de76143 100644 --- a/entity/ModuleTree_entity/ModuleTree_entity.aod +++ b/entity/ModuleTree_entity/ModuleTree_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>ModuleTree_entity</name> <title>Tree Entity</title> <majorModelMode>DISTRIBUTED</majorModelMode> diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod index 904205782a..fa23a511ee 100644 --- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod +++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>ObjectRelation_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/ObjectRelation_entity/documentation.adoc</documentation> @@ -62,6 +62,7 @@ <children> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -77,6 +78,7 @@ <children> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -120,7 +122,7 @@ </entityProvider> <entityParameter> <name>ProviderType_param</name> - <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/providertype_param/code.js</code> <expose v="true" /> <mandatory v="true" /> <description>PARAMETER</description> @@ -134,6 +136,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/providertype_param/code.js similarity index 100% rename from entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js rename to entity/ObjectRelation_entity/entityfields/providertype_param/code.js diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod index ac7eb0435a..e80a55b98d 100644 --- a/entity/Object_entity/Object_entity.aod +++ b/entity/Object_entity/Object_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Object_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index bcdcc37b86..f6f21582c8 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Offer_entity</name> <title>Offer</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -107,23 +107,27 @@ <children> <entityParameter> <name>OfferId_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerid_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> </entityParameter> <entityParameter> <name>Currency_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currency_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> </entityParameter> <entityParameter> <name>OfferStatus_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> @@ -271,12 +275,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -291,12 +298,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -338,6 +348,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -352,6 +363,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -381,6 +393,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -396,9 +409,11 @@ <children> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod index e6021a046f..3a7654eeaf 100644 --- a/entity/Offeritem_entity/Offeritem_entity.aod +++ b/entity/Offeritem_entity/Offeritem_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Offeritem_entity</name> <title>Offeritem</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -188,6 +188,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -202,6 +203,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod index f617a9137b..2db6f849e8 100644 --- a/entity/Options_Entity/Options_Entity.aod +++ b/entity/Options_Entity/Options_Entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Options_Entity</name> <title>Options</title> <description></description> diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index fbbcae0c70..7f15d48fa9 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Order_entity</name> <title>Receipt</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -103,23 +103,27 @@ <children> <entityParameter> <name>OrderId_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderid_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> </entityParameter> <entityParameter> <name>Currency_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/currency_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/ContactId_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> </entityParameter> <entityParameter> <name>OrderStatus_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/orderstatus_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> @@ -233,12 +237,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -253,12 +260,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -286,6 +296,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -300,6 +311,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -359,9 +371,11 @@ <children> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/activities/children/rowid_param/code.js</code> </entityParameter> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Order_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod index 318b82aa92..c479324ec1 100644 --- a/entity/Orderitem_entity/Orderitem_entity.aod +++ b/entity/Orderitem_entity/Orderitem_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Orderitem_entity</name> <title>Orderitem</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -182,6 +182,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -196,6 +197,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod index 0181858a8b..8b81dfb087 100644 --- a/entity/Organisation_entity/Organisation_entity.aod +++ b/entity/Organisation_entity/Organisation_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Organisation_entity</name> <title>Company</title> <description>former Org</description> @@ -69,10 +69,12 @@ <children> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/rowid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -88,10 +90,12 @@ <children> <entityParameter> <name>OrgId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/contacts/children/contactid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -150,10 +154,12 @@ <children> <entityParameter> <name>DefaultAddressId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/addresses/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> </entityParameter> @@ -179,6 +185,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> </entityParameter> @@ -196,6 +203,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/contracts/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> <mandatory v="true" /> @@ -214,6 +222,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/productprices/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="false" /> <mandatory v="true" /> @@ -261,12 +270,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -321,6 +333,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/code.js</code> <expose v="false" /> </entityParameter> </children> @@ -336,6 +349,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/code.js</code> <expose v="false" /> </entityParameter> </children> @@ -375,11 +389,13 @@ <children> <entityParameter> <name>objectRowId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>objectType_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -396,9 +412,11 @@ <children> <entityParameter> <name>ObjectRowid_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/code.js</code> </entityParameter> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -413,6 +431,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -427,6 +446,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -450,6 +470,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -464,6 +485,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -478,6 +500,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -508,6 +531,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod index ef5b3f7b43..3d0148e0b0 100644 --- a/entity/Person_entity/Person_entity.aod +++ b/entity/Person_entity/Person_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Person_entity</name> <title>Contact</title> <description>former Pers</description> @@ -92,9 +92,11 @@ <children> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/activities/children/rowid_param/code.js</code> </entityParameter> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -153,10 +155,12 @@ <children> <entityParameter> <name>DefaultAddressId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> </entityParameter> @@ -174,6 +178,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry. @@ -207,6 +212,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/contracts/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> <mandatory v="true" /> @@ -227,6 +233,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/pricelists/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="false" /> <mandatory v="true" /> @@ -289,12 +296,15 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -361,6 +371,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/contactid_param/code.js</code> <expose v="false" /> <triggerRecalculation v="true" /> </entityParameter> @@ -415,6 +426,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/code.js</code> <expose v="false" /> <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry. Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description> @@ -433,6 +445,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/code.js</code> <expose v="false" /> <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry. Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description> @@ -465,9 +478,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ObjectType_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/code.js</code> </entityParameter> <entityParameter> <name>ObjectRowid_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -482,6 +497,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/keywordgenders/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -506,6 +522,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/offers/children/contactid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -521,11 +538,13 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact <children> <entityParameter> <name>objectRowId_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>objectType_param</name> + <code>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod index 31d3adaf74..9d305196c6 100644 --- a/entity/Prod2prod_entity/Prod2prod_entity.aod +++ b/entity/Prod2prod_entity/Prod2prod_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Prod2prod_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation> diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index 34f6bbf0ee..ab14630e7b 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Product_entity</name> <title>Product</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -96,6 +96,7 @@ <children> <entityParameter> <name>ProductId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -112,6 +113,7 @@ <children> <entityParameter> <name>ProductId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/stock/children/productid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -137,6 +139,7 @@ <children> <entityParameter> <name>ProductId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/stockcount/children/productid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -170,6 +173,7 @@ <children> <entityParameter> <name>ProductId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/productlinks/children/productid_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="true" /> @@ -204,12 +208,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -224,12 +231,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -244,6 +254,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -258,6 +269,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -287,9 +299,11 @@ <children> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -312,9 +326,11 @@ <children> <entityParameter> <name>objectType_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objecttype_param/code.js</code> </entityParameter> <entityParameter> <name>objectRowId_param</name> + <code>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objectrowid_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod index b6957cc925..5a38013798 100644 --- a/entity/Productprice_entity/Productprice_entity.aod +++ b/entity/Productprice_entity/Productprice_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Productprice_entity</name> <title>Prices</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -171,6 +171,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -185,6 +186,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod index daee520110..c8f5a25654 100644 --- a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod +++ b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectClassificationEntry_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <recordContainer>jdito</recordContainer> diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod index 087c4e5714..145c9c428a 100644 --- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod +++ b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectClassification_entity</name> <title>Classification</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -22,10 +22,12 @@ <children> <entityParameter> <name>ClassId_param</name> + <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod index 44ad8b8a46..a19aebab16 100644 --- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod +++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectCompetition_entity</name> <title>Competition</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -94,6 +94,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/ContactId_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> @@ -119,6 +120,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js</code> <documentation>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc</documentation> </entityParameter> </children> @@ -139,6 +141,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -153,6 +156,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -167,6 +171,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -181,6 +186,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -195,6 +201,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -210,12 +217,15 @@ <children> <entityParameter> <name>objectType_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js</code> </entityParameter> <entityParameter> <name>objectRowId_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js</code> </entityParameter> <entityParameter> <name>filteredAttributeIds_param</name> + <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod index 8a5a058e9f..86237f6e86 100644 --- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod +++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectCycle_entity</name> <title>Milestones</title> <majorModelMode>DISTRIBUTED</majorModelMode> diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod index 3d8d874c9c..ac4410f847 100644 --- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod +++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectForecast_entity</name> <title>${FORECAST_ENGLISH}</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -76,6 +76,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> <documentation>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc</documentation> </entityParameter> </children> diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod index 251ec15678..5b62c806fc 100644 --- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod +++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectMember_entity</name> <title>${SALESPROJECT_MEMBER}</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -98,6 +98,7 @@ <children> <entityParameter> <name>ContactId_param</name> + <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/ContactId_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -148,6 +149,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod index 9331519383..ec08058c77 100644 --- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod +++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>SalesprojectSource_entity</name> <title>Touchpoint</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -69,6 +69,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 1502e810aa..550a25b68c 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Salesproject_entity</name> <title>Salesproject</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -114,6 +114,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -130,6 +131,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcycles/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -146,6 +148,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -162,6 +165,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -178,6 +182,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -194,10 +199,12 @@ <children> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/rowid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -213,6 +220,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -229,6 +237,7 @@ <children> <entityParameter> <name>SalesprojectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -252,10 +261,12 @@ <children> <entityParameter> <name>ObjectId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/objectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> <name>RowId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -299,12 +310,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -319,12 +333,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -346,6 +363,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -360,6 +378,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -374,6 +393,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphase/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod index 68b7a161f4..290cc9e329 100644 --- a/entity/Social_entity/Social_entity.aod +++ b/entity/Social_entity/Social_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Social_entity</name> <title>Social Media</title> <majorModelMode>DISTRIBUTED</majorModelMode> diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod index 43c441f54c..884e876523 100644 --- a/entity/Stock_entity/Stock_entity.aod +++ b/entity/Stock_entity/Stock_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Stock_entity</name> <title>Stock</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -103,6 +103,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod index f6dca6bf9b..a959133c14 100644 --- a/entity/Task_entity/Task_entity.aod +++ b/entity/Task_entity/Task_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Task_entity</name> <title>Task</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -131,12 +131,15 @@ <children> <entityParameter> <name>AssignmentName_param</name> + <code>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> + <code>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code> </entityParameter> <entityParameter> <name>AssignmentTable_param</name> + <code>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -151,6 +154,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -165,6 +169,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -180,10 +185,12 @@ <children> <entityParameter> <name>ID</name> + <code>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id/code.js</code> <description>PARAMETER</description> </entityParameter> <entityParameter> <name>ContextName</name> + <code>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js</code> </entityParameter> </children> </entityConsumer> @@ -242,6 +249,7 @@ <children> <entityParameter> <name>containerName_param</name> + <code>%aditoprj%/entity/Task_entity/entityfields/keywordpriority/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index b39f8f8e77..e4c846e283 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Timetracking_entity</name> <title>Timetracking</title> <majorModelMode>DISTRIBUTED</majorModelMode> diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod index 0fdd436343..193ddaf48a 100644 --- a/entity/Turnover_entity/Turnover_entity.aod +++ b/entity/Turnover_entity/Turnover_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> <name>Turnover_entity</name> <title>Turnover</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -34,7 +34,7 @@ </entityField> <entityParameter> <name>YearCountToShow_param</name> - <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="false" /> @@ -43,7 +43,7 @@ </entityParameter> <entityParameter> <name>MaxYear_param</name> - <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js</valueProcess> + <code>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/code.js</code> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="false" /> diff --git a/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js b/entity/Turnover_entity/entityfields/maxyear_param/code.js similarity index 100% rename from entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js rename to entity/Turnover_entity/entityfields/maxyear_param/code.js diff --git a/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js b/entity/Turnover_entity/entityfields/yearcounttoshow_param/code.js similarity index 100% rename from entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js rename to entity/Turnover_entity/entityfields/yearcounttoshow_param/code.js -- GitLab