diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod index 7a53655d326d89c0f289e70d22176c8ed389a346..27bd01462c6cfe52e580468756201a33b84bd200 100644 --- a/entity/Attribute_entity/Attribute_entity.aod +++ b/entity/Attribute_entity/Attribute_entity.aod @@ -278,6 +278,10 @@ </entityParameter> </children> </entityConsumer> + <entityField> + <name>IMAGE</name> + <contentType>IMAGE</contentType> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod index cc14877d0f62f3d79739e5988419cfe5dee5fbe3..172115bc01b310b95503e7794baa03ebf85fe85d 100644 --- a/entity/Document_entity/Document_entity.aod +++ b/entity/Document_entity/Document_entity.aod @@ -96,6 +96,11 @@ <name>DESCRIPTION</name> <title>Beschreibung</title> <contentType>LONG_TEXT</contentType> + <onValueChangeTypes> + <element>MASK</element> + <element>PROCESS</element> + <element>PROCESS_SETVALUE</element> + </onValueChangeTypes> </entityField> <entityField> <name>KEYWORD</name> diff --git a/entity/Productprice_entity/entityfields/image/valueProcess.js b/entity/Productprice_entity/entityfields/image/valueProcess.js index 1a61d32b892076cb93d6b4a4faeec1cf026a9ea8..85f3b477fd58bfb136e4dc5b1f7599a91fd1721a 100644 --- a/entity/Productprice_entity/entityfields/image/valueProcess.js +++ b/entity/Productprice_entity/entityfields/image/valueProcess.js @@ -1,5 +1,6 @@ import("system.vars"); import("system.result"); import("Keyword_lib"); +import("KeywordRegistry_basic"); -result.string("TEXT:" + vars.get("$field.BUYSELL") ); \ No newline at end of file +result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.productPricelist(), vars.getString("$field.PRICELIST"))); diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod index f479afb820b077913c99b9e6e8d8b705ea07aad8..2424d7542058a15e42df7b7e48896db39b7a579f 100644 --- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod +++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod @@ -18,6 +18,7 @@ <entityField> <name>INFO</name> <title>Info</title> + <contentType>LONG_TEXT</contentType> </entityField> <entityField> <name>REASON</name> @@ -258,6 +259,12 @@ </entityParameter> </children> </entityConsumer> + <entityField> + <name>IMAGE</name> + <contentType>IMAGE</contentType> + <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/image/displayValueProcess.js</displayValueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/SalesprojectCompetition_entity/entityfields/image/displayValueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/image/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..d071e384e95b26e1b3013d43ac5c4f45ae4cc579 --- /dev/null +++ b/entity/SalesprojectCompetition_entity/entityfields/image/valueProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("system.result"); + +result.string("TEXT:" + vars.getString("$field.ORGANISATION_NAME")); \ No newline at end of file diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod index 945e940b05d1be8647b5655996ccf1b92b6d45ea..7a4816bce187d9b02b224a6baed1b8d05867a3f5 100644 --- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod +++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod @@ -24,6 +24,7 @@ <entityField> <name>INFO</name> <title>Info</title> + <contentType>LONG_TEXT</contentType> </entityField> <entityField> <name>SALESPROJECT_FORECASTID</name> diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 34d70c4c5c837c0037758c17019ef930c01b2023..02d64dfe90a94fa27d2e593d619406de0078ce1e 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -36,6 +36,7 @@ <entityField> <name>INFO</name> <title>Information</title> + <contentType>LONG_TEXT</contentType> </entityField> <entityField> <name>PHASE</name> diff --git a/entity/Salesproject_entity/entityfields/image/valueProcess.js b/entity/Salesproject_entity/entityfields/image/valueProcess.js index c04626b8e075d07b742f63f4810cde51d710516e..a8deaca2b8e2e1a05aacb0fb199ba26b655844e2 100644 --- a/entity/Salesproject_entity/entityfields/image/valueProcess.js +++ b/entity/Salesproject_entity/entityfields/image/valueProcess.js @@ -3,4 +3,4 @@ import("system.result"); import("Keyword_lib"); import("KeywordRegistry_basic"); -result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), vars.getString("$field.STATE")) ); \ No newline at end of file +result.string("TEXT:" + vars.getString("$field.PROJECTTITLE")); \ No newline at end of file diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index 621e193b43e4142e3a8588ba17876d95cb549f77..5ecb9a7fa6f694d0a682f27818d42801abee4958 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -12,6 +12,11 @@ <name>INFO</name> <title>Description</title> <contentType>LONG_TEXT</contentType> + <onValueChangeTypes> + <element>MASK</element> + <element>PROCESS</element> + <element>PROCESS_SETVALUE</element> + </onValueChangeTypes> </entityField> <entityField> <name>MINUTES</name> diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod index 4933b78162863b690531c4dfb8d4d145f8e90a0d..c508588317a7ad788ca44f004382c3120b2f2bc6 100644 --- a/neonView/ContractFilter_view/ContractFilter_view.aod +++ b/neonView/ContractFilter_view/ContractFilter_view.aod @@ -62,14 +62,6 @@ <name>845c3a71-0fa9-4299-9b85-8fa25f92436d</name> <entityField>CONTRACTEND</entityField> </neonTableColumn> - <neonTableColumn> - <name>b72f0fa5-43ba-4852-9dfa-db592193e5a6</name> - <entityField>PAYMENT</entityField> - </neonTableColumn> - <neonTableColumn> - <name>ae80fe48-c0c7-4b53-b014-a25417c6fb35</name> - <entityField>CONTRACTDUE</entityField> - </neonTableColumn> </columns> </tableViewTemplate> </children> diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod index 541ac072d5e3df256b4b726da078a091dd94bd8f..ee8f03128aa738e1bdce1f7eb404d0ebd6eeb547 100644 --- a/neonView/OfferFilter_view/OfferFilter_view.aod +++ b/neonView/OfferFilter_view/OfferFilter_view.aod @@ -53,6 +53,10 @@ <name>Offers</name> <entityField>#ENTITY</entityField> <columns> + <neonTableColumn> + <name>5755c4a7-0ec4-4ba8-9fa8-a64c440042f8</name> + <entityField>IMAGE</entityField> + </neonTableColumn> <neonTableColumn> <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name> <entityField>FullOfferCode</entityField> diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod index f631fc736b5d10bc66abd6f4ea02ff47273dd088..0c2cb08ffc4b05dab0f2d3a167f55501d47086f1 100644 --- a/neonView/OrderFilter_view/OrderFilter_view.aod +++ b/neonView/OrderFilter_view/OrderFilter_view.aod @@ -53,6 +53,10 @@ <name>Orders</name> <entityField>#ENTITY</entityField> <columns> + <neonTableColumn> + <name>8d4948c3-40cb-45dd-ae04-32ae06458b26</name> + <entityField>IMAGE</entityField> + </neonTableColumn> <neonTableColumn> <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name> <entityField>SALESORDERCODE</entityField> diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod index ae8dfc222cf2f206b7905db3294cd6c06b599d30..e3f46d0784614e5bfe394425774171e73e0d5b8c 100644 --- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod +++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod @@ -10,7 +10,9 @@ <children> <cardViewTemplate> <name>Header</name> + <iconField>IMAGE</iconField> <titleField>CONTACT_ID</titleField> + <subtitleField>CONTACT_ID</subtitleField> <descriptionField>INFO</descriptionField> <entityField>#ENTITY</entityField> </cardViewTemplate> diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod index 0b8c264401f9179e1080095d019415bb750cfad2..a04bd4d99520afa22000c81decd2b2f623d7caaa 100644 --- a/neonView/TaskFilter_view/TaskFilter_view.aod +++ b/neonView/TaskFilter_view/TaskFilter_view.aod @@ -28,7 +28,7 @@ <children> <timelineViewTemplate> <name>TasksTimeline</name> - <dateField>START_DATE</dateField> + <dateField>MATURITY_DATE</dateField> <titleField>SUBJECT</titleField> <descriptionField>DESCRIPTION</descriptionField> <iconIdField>#ICON</iconIdField>