diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod index bf6bac7e1b76d842c6774c8da6d4540b43122a85..4c1f4fdf4596bf43b351dfb7ec8954afcc181ec3 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>ActivityLink_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <recordContainer>db</recordContainer> @@ -62,7 +62,6 @@ <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 f0024a83bf8b842a582d39049682a1086d667fec..9156f47d7b7c319773b459e8ce308a59bf5a0a6f 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Activity_entity</name> <title>Activity</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -98,15 +98,12 @@ <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> @@ -122,15 +119,12 @@ <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> @@ -162,7 +156,6 @@ <children> <entityParameter> <name>ActivityId_param</name> - <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/code.js</code> <expose v="true" /> </entityParameter> </children> @@ -178,7 +171,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -269,11 +261,9 @@ <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> @@ -324,7 +314,6 @@ <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 e1dd74e5b3c25014aa8b7f711e9601f377d7f55c..2392409422e30717ef106d1e5125e0d55104b588 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Address_entity</name> <title>Addresses</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -83,7 +83,6 @@ <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> @@ -118,7 +117,6 @@ <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> @@ -161,7 +159,6 @@ <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> @@ -198,7 +195,6 @@ <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 179c872d486998178606e9d4735e3f2b54eb07a5..95e281ecf4b7287d396459de59d9c8f5b867223f 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>AnyContact_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess> @@ -71,7 +71,6 @@ 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> @@ -86,7 +85,6 @@ 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> @@ -118,7 +116,6 @@ 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> @@ -134,7 +131,6 @@ 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 88950dc8c8a13e8fa81aa062eb65ccbf8eda13e3..0c2f7e188d33664f7dabb265422ebaa2b7764fd7 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>AppointmentLink_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <recordContainer>db</recordContainer> @@ -74,7 +74,6 @@ <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 632ee34458f5cc6325c62d80d9c0280744897ec9..ce5b73f61cb880af613d4f90149498f2f71f6c2d 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Appointment_entity</name> <title>Termin</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -155,7 +155,6 @@ <children> <entityParameter> <name>AppointmentId_param</name> - <code>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -170,7 +169,6 @@ <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> @@ -186,7 +184,6 @@ <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 b585ba84eb837f511a4ad2d5bc57a7635328092d..31485b45335ed8906326cf558cd288495236a4fa 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>AttributeRelation_entity</name> <title>Attribute Relation</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -148,7 +148,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -172,13 +171,11 @@ <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 0b86ccf6212f09006f5e9c24a0c24fbc3c85b413..52b0452a524d0b0271b46df4869adf16fb68d16c 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 e1f914dbd98e1a510121261aa14c96e256443e68..5da6c60b02b61577dec22c4f960c8050b2d2944e 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Attribute_entity</name> <title>Attribute</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -53,13 +53,11 @@ <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> @@ -100,7 +98,6 @@ <children> <entityParameter> <name>attributeId_param</name> - <code>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -123,7 +120,6 @@ <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 30793c5263f6a7fd596fdf048fcbe0c5b172f6d7..9cc1e9c618b1851d8514fcf0bcd1fc653c7824ee 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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> - <code>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js</code> + <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js</valueProcess> <mandatory v="false" /> <description>PARAMETER</description> </entityParameter> @@ -113,7 +113,6 @@ 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> @@ -152,7 +151,6 @@ 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> @@ -171,7 +169,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact </entityParameter> <entityParameter> <name>CommMediumIds_param</name> - <code>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/code.js</code> + <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js</valueProcess> <triggerRecalculation v="true" /> <description>PARAMETER</description> </entityParameter> @@ -186,7 +184,6 @@ 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/code.js b/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js similarity index 100% rename from entity/Communication_entity/entityfields/commmediumids_param/code.js rename to entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js diff --git a/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js b/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js similarity index 100% rename from entity/Communication_entity/entityfields/contactsmaincountry_param/code.js rename to entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod index 1f8378aaf3d4ddc7878f049c68612e53fa9eeffe..ba84fe0c8b88c17267a1ba9857dbf78def146671 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 50bea07aae4582451358708b1555fdb12e57f6f8..ae1bd2621511de1fa1cb23cd836916494a22c9eb 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Contract_entity</name> <title>Contract</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -140,11 +140,9 @@ <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> @@ -179,17 +177,14 @@ <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> @@ -206,15 +201,12 @@ <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> @@ -229,7 +221,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -244,7 +235,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -259,7 +249,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -282,13 +271,11 @@ <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 105481d336111a3f1f0ede9f9a95a38591c92d37..d386837c6d5b3b29c33a02664ec20d108f0f6075 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Countries_Entity</name> <title>Countries</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -33,12 +33,10 @@ <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 210404deb6e4c33919febb3b8d565869f6887468..0d0a94e1af5d6b9b469eaa234a5f73b374388da7 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Document_entity</name> <title>Document</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -237,7 +237,6 @@ <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 e35660701c627def429d76cd585b42a72a1e722f..9447d448ed4ed925976ee4e3ea60b61d7ba8293e 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 670f20a09c9d70a7e845c5ef86afb3523b3499db..d69bf9b4524f0ab1830bc81533884e2242f7a4d4 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>KeywordAttributeRelation_entity</name> <title>Keyword Attribute Values</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -60,7 +60,7 @@ </entityProvider> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js</code> + <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess> <triggerRecalculation v="true" /> <mandatory v="false" /> <description>PARAMETER</description> @@ -76,11 +76,9 @@ <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/code.js b/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js similarity index 100% rename from entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js rename to entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod index e1079bb8c8e2765881abf59cddf9d4dcee1d8f8d..a422a176305f7d4080aada51d5507932949029f4 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>KeywordAttribute_entity</name> <title>Keyword Attribute</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -82,7 +82,6 @@ <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 de0bacc7b2ce10ec457028c7be050fd9c5d87e09..090c9c49917174533672b16dbc7ce2de15e38e87 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>KeywordEntry_entity</name> <title>Keyword</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -346,7 +346,6 @@ <children> <entityParameter> <name>onlyActives_param</name> - <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/code.js</code> <expose v="true" /> </entityParameter> <entityParameter> @@ -361,7 +360,7 @@ </entityField> <entityParameter> <name>onlyActives_param</name> - <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/code.js</code> + <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess> <expose v="true" /> <triggerRecalculation v="true" /> <description>PARAMETER</description> @@ -378,7 +377,6 @@ <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/code.js b/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js similarity index 100% rename from entity/KeywordEntry_entity/entityfields/onlyactives_param/code.js rename to entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod index f6202420add12a3e0c664ead7cc6910e1e87da8e..29207002f6a1ead7e5d1b5d1e322817aa082edc1 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 c23de7614329146b8b129bfad95aa7d62c621064..8aff9b18a14460074184ab44b37d932fc59a6783 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 fa23a511ee836e370a14f3d985bc11b5cfe5673b..904205782abada4b34dabc48d9be581c53b495f1 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>ObjectRelation_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/ObjectRelation_entity/documentation.adoc</documentation> @@ -62,7 +62,6 @@ <children> <entityParameter> <name>ObjectType_param</name> - <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -78,7 +77,6 @@ <children> <entityParameter> <name>ObjectType_param</name> - <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -122,7 +120,7 @@ </entityProvider> <entityParameter> <name>ProviderType_param</name> - <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/providertype_param/code.js</code> + <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js</valueProcess> <expose v="true" /> <mandatory v="true" /> <description>PARAMETER</description> @@ -136,7 +134,6 @@ <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/code.js b/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js similarity index 100% rename from entity/ObjectRelation_entity/entityfields/providertype_param/code.js rename to entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod index e80a55b98df5c4bc34cbc092f3d2d74817b2584d..ac7eb0435aed226bf90eee399b8de5db83201662 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 f6f21582c8d3a20e7a4c19e40bae8ff182494fc7..bcdcc37b8644364935cb91eb7bf75494284f35fe 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Offer_entity</name> <title>Offer</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -107,27 +107,23 @@ <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" /> @@ -275,15 +271,12 @@ <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> @@ -298,15 +291,12 @@ <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> @@ -348,7 +338,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -363,7 +352,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -393,7 +381,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Offer_entity/entityfields/keywordprobability/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -409,11 +396,9 @@ <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 3a7654eeaf40b5f2b89f33cd6514504f88496748..e6021a046f854080fb37c0379c1f413603e8363e 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Offeritem_entity</name> <title>Offeritem</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -188,7 +188,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -203,7 +202,6 @@ <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 2db6f849e8f1c8610869de8c5505cd40066a2217..f617a9137b6b8af7d3679fce8f5d9447f15b63ae 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 7f15d48fa9d854c7fb7d10315dae9aa55e2d4a26..fbbcae0c7059996b2b1b8fb28cdc1b6b8f41610b 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Order_entity</name> <title>Receipt</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -103,27 +103,23 @@ <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" /> @@ -237,15 +233,12 @@ <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> @@ -260,15 +253,12 @@ <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> @@ -296,7 +286,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -311,7 +300,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -371,11 +359,9 @@ <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 c479324ec12198fed69af55498a8f6bc10d18342..318b82aa925221ddddebecf382cc23fbf3564d44 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Orderitem_entity</name> <title>Orderitem</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -182,7 +182,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -197,7 +196,6 @@ <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 8b81dfb0873a6a0f8d58ac888f7ff87641e709a6..0181858a8b21a0f5a95b9366903cc4accdeaea78 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Organisation_entity</name> <title>Company</title> <description>former Org</description> @@ -69,12 +69,10 @@ <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> @@ -90,12 +88,10 @@ <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> @@ -154,12 +150,10 @@ <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> @@ -185,7 +179,6 @@ <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> @@ -203,7 +196,6 @@ <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" /> @@ -222,7 +214,6 @@ <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" /> @@ -270,15 +261,12 @@ <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> @@ -333,7 +321,6 @@ <children> <entityParameter> <name>ContactId_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/phonecommunications/children/contactid_param/code.js</code> <expose v="false" /> </entityParameter> </children> @@ -349,7 +336,6 @@ <children> <entityParameter> <name>ContactId_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/emailcommunications/children/contactid_param/code.js</code> <expose v="false" /> </entityParameter> </children> @@ -389,13 +375,11 @@ <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> @@ -412,11 +396,9 @@ <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> @@ -431,7 +413,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -446,7 +427,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordorganisationtypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -470,7 +450,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordprice_politics/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -485,7 +464,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordweakness/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -500,7 +478,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordstrenght/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -531,7 +508,6 @@ <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 3d0148e0b004605201f3371b242bec509c09e812..ef5b3f7b43c7731d27297eaf6bbfea882752931a 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Person_entity</name> <title>Contact</title> <description>former Pers</description> @@ -92,11 +92,9 @@ <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> @@ -155,12 +153,10 @@ <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> @@ -178,7 +174,6 @@ <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. @@ -212,7 +207,6 @@ 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" /> @@ -233,7 +227,6 @@ 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" /> @@ -296,15 +289,12 @@ 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> @@ -371,7 +361,6 @@ 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> @@ -426,7 +415,6 @@ 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> @@ -445,7 +433,6 @@ 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> @@ -478,11 +465,9 @@ 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> @@ -497,7 +482,6 @@ 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> @@ -522,7 +506,6 @@ 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> @@ -538,13 +521,11 @@ 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 9d305196c6df17d5383e74e2b8f37c867e40d410..31d3adaf749bfa15cf27d5a191accd448e040f9d 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 ab14630e7b739493e1533938f71e551befd0b599..34f6bbf0ee3cdd2d0da48ee42962a9ad7a8be423 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Product_entity</name> <title>Product</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -96,7 +96,6 @@ <children> <entityParameter> <name>ProductId_param</name> - <code>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -113,7 +112,6 @@ <children> <entityParameter> <name>ProductId_param</name> - <code>%aditoprj%/entity/Product_entity/entityfields/stock/children/productid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -139,7 +137,6 @@ <children> <entityParameter> <name>ProductId_param</name> - <code>%aditoprj%/entity/Product_entity/entityfields/stockcount/children/productid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -173,7 +170,6 @@ <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" /> @@ -208,15 +204,12 @@ <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> @@ -231,15 +224,12 @@ <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> @@ -254,7 +244,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Product_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -269,7 +258,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -299,11 +287,9 @@ <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> @@ -326,11 +312,9 @@ <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 5a38013798e0d3ee07dc4ffad661a4a803fb34cd..b6957cc9253eaaa50dcd7fa621ee434084644261 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Productprice_entity</name> <title>Prices</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -171,7 +171,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -186,7 +185,6 @@ <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 c8f5a25654fc80b1d61265b6da301fa54f85d9cb..daee52011029c79d4b93721eb4ea5d458ec98bdf 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 145c9c428aef721aee0b1edea24a840fd0cc981a..087c4e5714cf9d2a5552c356041a82da9098577c 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>SalesprojectClassification_entity</name> <title>Classification</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -22,12 +22,10 @@ <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 a19aebab16211c9cfb9fe0f1e1948e87e64cbebf..44ad8b8a467f30257229a6be315f64beafc639f1 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>SalesprojectCompetition_entity</name> <title>Competition</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -94,7 +94,6 @@ <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> @@ -120,7 +119,6 @@ <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> @@ -141,7 +139,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordprice_politics/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -156,7 +153,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordweakness/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -171,7 +167,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstrenght/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -186,7 +181,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordphase/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -201,7 +195,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -217,15 +210,12 @@ <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 86237f6e8636a7673196886a0e894cbc8540e0e3..8a5a058e9f830cb7b795b4a78a71d668282dcbdb 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 ac4410f847cf7bf4dae8f02f88799ea7ddb3d476..3d8d874c9c9741359cd1a3430a64d0013d9389b1 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>SalesprojectForecast_entity</name> <title>${FORECAST_ENGLISH}</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -76,7 +76,6 @@ <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 5b62c806fc791e1213539998422d6e6391b3d296..251ec15678bf9cb4f669632a3f4dd0b8da4cd156 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>SalesprojectMember_entity</name> <title>${SALESPROJECT_MEMBER}</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -98,7 +98,6 @@ <children> <entityParameter> <name>ContactId_param</name> - <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/ContactId_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -149,7 +148,6 @@ 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 ec08058c7701b5acf988f119331d09b85db9239d..933151938393f9cb8514b4f805eea356391a727d 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>SalesprojectSource_entity</name> <title>Touchpoint</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -69,7 +69,6 @@ <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 550a25b68ca86e3248fe0d4ba3d30dd80f1d113e..1502e810aa4fce7161bd6b11d1115bef076fc000 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Salesproject_entity</name> <title>Salesproject</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -114,7 +114,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -131,7 +130,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcycles/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -148,7 +146,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecasts/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -165,7 +162,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectcompetitions/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -182,7 +178,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectoffers/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -199,12 +194,10 @@ <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> @@ -220,7 +213,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectmembers/children/salesprojectid_param/code.js</code> <triggerRecalculation v="true" /> </entityParameter> </children> @@ -237,7 +229,6 @@ <children> <entityParameter> <name>SalesprojectId_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectclassifications/children/salesprojectid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -261,12 +252,10 @@ <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> @@ -310,15 +299,12 @@ <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> @@ -333,15 +319,12 @@ <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> @@ -363,7 +346,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -378,7 +360,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordstate/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -393,7 +374,6 @@ <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 290cc9e329d1c10cf2b8daa06a02f013018b7891..68b7a161f44632891410f28fe32e1e06126d6c4d 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 884e87652393a9fedb2087f9d50a16feaf304372..43c441f54caa15b4047c01d3ae77b558f4ac506a 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Stock_entity</name> <title>Stock</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -103,7 +103,6 @@ <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 a959133c142642f6c7df649fab3b589254e3df0d..f6dca6bf9bdf81114b0df86ecf227f3c8b8322ab 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Task_entity</name> <title>Task</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -131,15 +131,12 @@ <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> @@ -154,7 +151,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Task_entity/entityfields/keywordstates/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -169,7 +165,6 @@ <children> <entityParameter> <name>containerName_param</name> - <code>%aditoprj%/entity/Task_entity/entityfields/keywordtypes/children/containername_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -185,12 +180,10 @@ <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> @@ -249,7 +242,6 @@ <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 e4c846e28376cc90cabcc2f97b85e32f4929a6df..b39f8f8e77181201653a9d706efa042c6cf765d6 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <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 193ddaf48a9bf6b240ce92f64b2968e50e3d4e06..0fdd436343368d07d8afa194e2b9e02d1e5f5525 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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> +<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"> <name>Turnover_entity</name> <title>Turnover</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -34,7 +34,7 @@ </entityField> <entityParameter> <name>YearCountToShow_param</name> - <code>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/code.js</code> + <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="false" /> @@ -43,7 +43,7 @@ </entityParameter> <entityParameter> <name>MaxYear_param</name> - <code>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/code.js</code> + <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js</valueProcess> <expose v="true" /> <triggerRecalculation v="true" /> <mandatory v="false" /> diff --git a/entity/Turnover_entity/entityfields/maxyear_param/code.js b/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js similarity index 100% rename from entity/Turnover_entity/entityfields/maxyear_param/code.js rename to entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js diff --git a/entity/Turnover_entity/entityfields/yearcounttoshow_param/code.js b/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js similarity index 100% rename from entity/Turnover_entity/entityfields/yearcounttoshow_param/code.js rename to entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js