Skip to content
Snippets Groups Projects
Commit 7e3104da authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

merged master into webservice

parents 8d5d650e 36ebcbe8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 385 additions and 314 deletions
entity/Offer_entity/Offer_entity.aod
+ 1
− 0
View file @ 7e3104da
......@@ -645,6 +645,7 @@
<title>Link</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/stateProcess.js</stateProcess>
......
entity/Offer_entity/entityfields/contact_id/onValidation.js
+ 12
− 12
View file @ 7e3104da
import("system.logging");
import("system.result");
import("system.translate");
import("system.vars");
import("Context_lib");
import("Entity_lib");
import("Contact_lib");
if (ContactUtils.getContactTypeByContactId(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) != 2 && ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) == 0) {
logging.log(ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))));
//result.string(translate.text("This contact has no possible link."))
}
\ No newline at end of file
//import("system.logging");
//import("system.result");
//import("system.translate");
//import("system.vars");
//import("Context_lib");
//import("Entity_lib");
//import("Contact_lib");
//
//if (ContactUtils.getContactTypeByContactId(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) != 2 && ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) == 0) {
// logging.log(ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))));
// result.string(translate.text("This contact has no possible link."))
//}
\ No newline at end of file
entity/Offer_entity/entityfields/contact_id/onValueChange.js
+ 3
− 1
View file @ 7e3104da
......@@ -23,4 +23,6 @@ else
neon.setFieldValue("$field.LANGUAGE", "");
}
neon.setFieldValue("$field.OBJECT_ROWID", "");
\ No newline at end of file
neon.setFieldValue("$field.OBJECT_ROWID", "");
neon.setFieldValue("$field.DELIVERYTERMS", "");
neon.setFieldValue("$field.PAYMENTTERMS", "");
entity/Offeritem_entity/Offeritem_entity.aod
+ 1
− 1
View file @ 7e3104da
......@@ -75,7 +75,7 @@
<consumer>Products</consumer>
<linkedContext>Product</linkedContext>
<mandatory v="true" />
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
......
entity/Offeritem_entity/entityfields/product_id/stateProcess.js 0 → 100644
+ 12
− 0
View file @ 7e3104da
import("system.result");
import("system.neon");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/Person_entity/Person_entity.aod
+ 1
− 1
View file @ 7e3104da
......@@ -870,7 +870,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityActionField>
<name>openAdminInfo</name>
<title>Open admin info</title>
<title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openadmininfo/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/openadmininfo/stateProcess.js</stateProcess>
......
entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+ 2
− 1
View file @ 7e3104da
......@@ -100,7 +100,7 @@
<name>StateMilestones</name>
<dependencies>
<entityDependency>
<name>da87708b-e998-4694-81ae-d0068f789a89</name>
<name>f705534d-dcf3-4049-a1ea-3f75e93aa2f0</name>
<entityName>Salesproject_entity</entityName>
<fieldName>SalesprojectStateMilestones</fieldName>
<isConsumer v="false" />
......@@ -110,6 +110,7 @@
<entityParameter>
<name>Type_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
</entityProvider>
......
entity/Salesproject_entity/Salesproject_entity.aod
+ 6
− 0
View file @ 7e3104da
......@@ -503,6 +503,12 @@
<entityName>SalesprojectMilestone_entity</entityName>
<fieldName>StateMilestones</fieldName>
</dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
......
entity/Salesproject_entity/entityfields/phase/valueProcess.js
+ 2
− 1
View file @ 7e3104da
import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("system.result");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("9f7d1fa9-7c09-4037-8f7c-8458def14d89"); //NQC
\ No newline at end of file
result.string($KeywordRegistry.salesprojectPhase$nqc()); //NQC
\ No newline at end of file
entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 7e3104da
import("system.result");
import("system.vars");
result.string(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
entity/Salesproject_entity/entityfields/state/onValueChange.js
+ 1
− 1
View file @ 7e3104da
......@@ -15,7 +15,7 @@ if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
if (state == $KeywordRegistry.salesprojectState$postponed())
{
var stateName = KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), state);
var clearForecast = question.askYesNo(translate.withArguments("Clear forecast and set state to '%0'?", [stateName]), translate.withArguments("Would you really like to clear the forecast and set the state to '%0'?" + "\n" + translate.text("This cannot be undone!"), [stateName]), false);
var clearForecast = question.askYesNo(translate.withArguments("Clear forecast and set state to '%0'?", [stateName]), translate.withArguments("Would you really like to clear the forecast and set the state to '%0'?", [stateName]) + "\n" + translate.text("This cannot be undone!"), false);
if (!clearForecast)
{
......
entity/Salesproject_entity/entityfields/state/valueProcess.js
+ 2
− 1
View file @ 7e3104da
import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("system.result");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712"); //Open
\ No newline at end of file
result.string($KeywordRegistry.salesprojectState$open()); //Open
\ No newline at end of file
neonView/ContractEdit_view/ContractEdit_view.aod
+ 74
− 60
View file @ 7e3104da
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5f2ef7a7-d7b5-49a8-86f3-3644036232fb</name>
<entityField>CONTRACTCODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>3177f8e9-24e9-441f-8c19-b004935a86a9</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ac160ded-1a06-4664-b8bd-333e01468f61</name>
<entityField>CONTRACTTYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f741bfda-5434-42ab-a5e9-ea1f7e4aaf79</name>
<entityField>CONTRACTSTATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b4a51794-f04c-4cc5-b0bd-ff89d8f5ada9</name>
<entityField>CONTRACTSTART</entityField>
</entityFieldLink>
<entityFieldLink>
<name>2fb49607-d34c-4a19-8c4e-2ec3db395fa9</name>
<entityField>CONTRACTEND</entityField>
</entityFieldLink>
<entityFieldLink>
<name>02d4e542-f7ed-4900-82b3-b096958e1473</name>
<entityField>PAYMENT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e66d7b82-5b48-46f3-b780-06a5f107faca</name>
<entityField>CONTRACTDUE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4390abcd-d47e-40b2-85a9-655d39b17e82</name>
<entityField>REMARK</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>49eafd04-4d72-4a11-8818-97407e0fe154</name>
<entityField>Attributes</entityField>
<view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Edit</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5f2ef7a7-d7b5-49a8-86f3-3644036232fb</name>
<entityField>CONTRACTCODE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>3177f8e9-24e9-441f-8c19-b004935a86a9</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ac160ded-1a06-4664-b8bd-333e01468f61</name>
<entityField>CONTRACTTYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f741bfda-5434-42ab-a5e9-ea1f7e4aaf79</name>
<entityField>CONTRACTSTATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b4a51794-f04c-4cc5-b0bd-ff89d8f5ada9</name>
<entityField>CONTRACTSTART</entityField>
</entityFieldLink>
<entityFieldLink>
<name>2fb49607-d34c-4a19-8c4e-2ec3db395fa9</name>
<entityField>CONTRACTEND</entityField>
</entityFieldLink>
<entityFieldLink>
<name>02d4e542-f7ed-4900-82b3-b096958e1473</name>
<entityField>PAYMENT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e66d7b82-5b48-46f3-b780-06a5f107faca</name>
<entityField>CONTRACTDUE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4390abcd-d47e-40b2-85a9-655d39b17e82</name>
<entityField>REMARK</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Description</name>
<editMode v="true" />
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>d16e9cd4-a41d-43b8-ae79-9c30eb3cad73</name>
<entityField>REMARK</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>49eafd04-4d72-4a11-8818-97407e0fe154</name>
<entityField>Attributes</entityField>
<view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
neonView/ContractPreview_view/ContractPreview_view.aod
+ 67
− 66
View file @ 7e3104da
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<headerFooterLayout>
<name>layout</name>
<header>Header</header>
</headerFooterLayout>
</layout>
<children>
<cardViewTemplate>
<name>Header</name>
<iconField>IMAGE</iconField>
<titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>Details</name>
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
<entityField>CONTRACTSTATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
<entityField>CONTRACTSTART</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
<entityField>CONTRACTEND</entityField>
</entityFieldLink>
<entityFieldLink>
<name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
<entityField>PAYMENT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>6529a64b-4249-434a-8692-45daad5264e3</name>
<entityField>CONTRACTDUE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
<drawerCaption>Further informations</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
<entityField>REMARK</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
<entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>
</neonView>
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>ContractPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<headerFooterLayout>
<name>layout</name>
<header>Header</header>
</headerFooterLayout>
</layout>
<children>
<cardViewTemplate>
<name>Header</name>
<iconField>IMAGE</iconField>
<titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
<descriptionField>CONTACT_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>Details</name>
<showDrawer v="true" />
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
<entityField>CONTRACTSTATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
<entityField>CONTRACTSTART</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
<entityField>CONTRACTEND</entityField>
</entityFieldLink>
<entityFieldLink>
<name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
<entityField>PAYMENT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>6529a64b-4249-434a-8692-45daad5264e3</name>
<entityField>CONTRACTDUE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
<entityField>REMARK</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
<entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>
</neonView>
neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod
+ 11
− 1
View file @ 7e3104da
......@@ -6,6 +6,7 @@
<layout>
<boxLayout>
<name>layout</name>
<autoHeight v="true" />
</boxLayout>
</layout>
<children>
......@@ -18,8 +19,17 @@
<name>9f8ad216-e4da-4973-bf3f-1d24dca765f3</name>
<entityField>LANG</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Description</name>
<editMode v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>64dde5e6-d8f7-42f7-bea9-104210ebf08f</name>
<name>aacd9212-d267-4ff2-ac4c-b0362bd9b09c</name>
<entityField>DESCRIPTION</entityField>
</entityFieldLink>
</fields>
......
neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod
+ 40
− 30
View file @ 7e3104da
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DescriptionTranslationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>TranslationInfo</name>
<showDrawer v="true" />
<drawerCaption></drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5e432839-ca9a-4a29-8006-0a1673d94c92</name>
<entityField>LANG</entityField>
</entityFieldLink>
<entityFieldLink>
<name>1348a3ee-b372-4091-a0d5-5ab45fcb58a9</name>
<entityField>DESCRIPTION</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DescriptionTranslationPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
<autoHeight v="true" />
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>TranslationInfo</name>
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5e432839-ca9a-4a29-8006-0a1673d94c92</name>
<entityField>LANG</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Description</name>
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>d7b004c9-354a-4648-9e41-ed18335370ad</name>
<entityField>DESCRIPTION</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+ 71
− 67
View file @ 7e3104da
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Info</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>a1d02350-10ed-4189-ab65-e750121a7efd</name>
<entityField>ITEMPOSITION</entityField>
</entityFieldLink>
<entityFieldLink>
<name>18f778d3-5672-48c5-b0f7-2c062662f9d1</name>
<entityField>PRODUCT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e280db0c-0ac2-40d4-95c2-b59268c4f663</name>
<entityField>QUANTITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f7bb223a-ab77-45b5-b6c0-9c8f4d478999</name>
<entityField>UNIT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
<entityField>PRICE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4f339738-6358-463e-b941-3b2693ab115a</name>
<entityField>DISCOUNT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c0a22aa4-b09d-4d8b-8d24-1750eb7ba5ca</name>
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e40aa70c-2a6a-4ff4-818f-0a56bc4c63f4</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8df0d334-f0d8-4905-a7b1-e71576f3b24f</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Price</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>9200df17-11e2-4a1a-babb-ea48c6f88a93</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
<direction>VERTICAL</direction>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Info</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>a1d02350-10ed-4189-ab65-e750121a7efd</name>
<entityField>ITEMPOSITION</entityField>
</entityFieldLink>
<entityFieldLink>
<name>18f778d3-5672-48c5-b0f7-2c062662f9d1</name>
<entityField>PRODUCT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e280db0c-0ac2-40d4-95c2-b59268c4f663</name>
<entityField>QUANTITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f7bb223a-ab77-45b5-b6c0-9c8f4d478999</name>
<entityField>UNIT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
<entityField>PRICE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4f339738-6358-463e-b941-3b2693ab115a</name>
<entityField>DISCOUNT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c0a22aa4-b09d-4d8b-8d24-1750eb7ba5ca</name>
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e40aa70c-2a6a-4ff4-818f-0a56bc4c63f4</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>0b26591b-e97b-4c09-9584-3bdd6dc2740c</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Description</name>
<editMode v="true" />
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5cc8a2cb-92aa-4365-a3dc-2471a6828cae</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+ 74
− 65
View file @ 7e3104da
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<headerFooterLayout>
<name>layout</name>
</headerFooterLayout>
</layout>
<children>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>171901d8-32a2-4689-aeb3-e00936172330</name>
<entityField>ITEMPOSITION</entityField>
</entityFieldLink>
<entityFieldLink>
<name>335b6954-46ab-4235-9681-3ebd261af72a</name>
<entityField>PRODUCT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e792d720-187f-4aa1-917c-1c8065222b72</name>
<entityField>QUANTITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9e25804b-198d-4505-b276-62bf58482dc6</name>
<entityField>UNIT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b503187b-db64-4d2f-839f-9e812ee5163e</name>
<entityField>PRICE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f8043352-f756-4854-9caa-a9aea073e4fe</name>
<entityField>DISCOUNT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>89b426b0-962f-4483-87c3-e6c0e0d0d651</name>
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
<entityFieldLink>
<name>3b207cf2-c621-4e7d-b7aa-32feace5fe04</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Price</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>4ced54f6-0d81-489b-b57b-432a75b77481</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>OfferitemPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<headerFooterLayout>
<name>layout</name>
</headerFooterLayout>
</layout>
<children>
<genericViewTemplate>
<name>Info</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>171901d8-32a2-4689-aeb3-e00936172330</name>
<entityField>ITEMPOSITION</entityField>
</entityFieldLink>
<entityFieldLink>
<name>335b6954-46ab-4235-9681-3ebd261af72a</name>
<entityField>PRODUCT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e792d720-187f-4aa1-917c-1c8065222b72</name>
<entityField>QUANTITY</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9e25804b-198d-4505-b276-62bf58482dc6</name>
<entityField>UNIT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b503187b-db64-4d2f-839f-9e812ee5163e</name>
<entityField>PRICE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f8043352-f756-4854-9caa-a9aea073e4fe</name>
<entityField>DISCOUNT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>89b426b0-962f-4483-87c3-e6c0e0d0d651</name>
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Price</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>4ced54f6-0d81-489b-b57b-432a75b77481</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Description</name>
<showDrawer v="true" />
<drawerCaption>Description</drawerCaption>
<hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>7386aee0-c1b2-4319-8ef8-1f1f75032c03</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/PersonMain_view/PersonMain_view.aod
+ 0
− 5
View file @ 7e3104da
......@@ -29,11 +29,6 @@
<entityField>360DegreeObjects</entityField>
<view>360DegreeFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>573d2b77-f948-47bc-bac1-621dd824c697</name>
<entityField>Tasks</entityField>
<view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
<entityField>Documents</entityField>
......
neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+ 1
− 1
View file @ 7e3104da
......@@ -27,7 +27,7 @@
<name>OpenSalesprojectsDashlet</name>
<title>Open salesprojects</title>
<description>Show open salesprojects</description>
<fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiNDgzYmNhZWItMWU1Yi00NzcyLWI1NGUtN2Q3ZDhhYTY1NzEyIiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
<fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiU0FMUFJPSlNUQVRPUEVOICAgICAgICAgICAgICAgICAgICAgIiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:filter</icon>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment