diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod index fcac2f5cbf4f5775864bc6845a0244bee4d86ea1..03a74be026b3ec946a0d3bdf38c3e0dc0ea91a19 100644 --- a/entity/Contract_entity/Contract_entity.aod +++ b/entity/Contract_entity/Contract_entity.aod @@ -371,6 +371,22 @@ <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess> <iconId>VAADIN:TASKS</iconId> </entityActionField> + <entityConsumer> + <name>LogHistoryConsumer</name> + <title>LogHistory</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>LogHistory_entity</entityName> + <fieldName>LogHistoryProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>tablenames_param</name> + <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..f3a33022dd2768fb78f05bafc713ba43d6272145 --- /dev/null +++ b/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js @@ -0,0 +1,10 @@ +import("system.vars"); +import("system.result"); +import("Context_lib"); + +var res = []; +res.push({id: vars.get("$field.CONTRACTID"), tableNames: ["AB_ATTRIBUTERELATION"]}); +res.push({id: vars.get("$field.CONTRACTID"), tableNames: ["CONTRACT"]}); + +res = JSON.stringify(res);//currently only strings can be passed as param +result.object(res); \ No newline at end of file diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod index d1a9470c67a8c537429b7c93c6001e6c644f861d..98452a68ce72222930234751a1d645bfd0a37ee9 100644 --- a/entity/LogHistory_entity/LogHistory_entity.aod +++ b/entity/LogHistory_entity/LogHistory_entity.aod @@ -47,6 +47,36 @@ <fieldName>LogHistoryConsumer</fieldName> <isConsumer v="false" /> </entityDependency> + <entityDependency> + <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name> + <entityName>Salesproject_entity</entityName> + <fieldName>LogHistoryConsumer</fieldName> + <isConsumer v="false" /> + </entityDependency> + <entityDependency> + <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name> + <entityName>Offer_entity</entityName> + <fieldName>LogHistoryConsumer</fieldName> + <isConsumer v="false" /> + </entityDependency> + <entityDependency> + <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name> + <entityName>Order_entity</entityName> + <fieldName>LogHistoryConsumer</fieldName> + <isConsumer v="false" /> + </entityDependency> + <entityDependency> + <name>de473d92-dbd3-4300-8887-163c997fcd62</name> + <entityName>Contract_entity</entityName> + <fieldName>LogHistoryConsumer</fieldName> + <isConsumer v="false" /> + </entityDependency> + <entityDependency> + <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name> + <entityName>Product_entity</entityName> + <fieldName>LogHistoryConsumer</fieldName> + <isConsumer v="false" /> + </entityDependency> </dependencies> </entityProvider> <entityParameter> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index d8d4f2b4d157abcd69062d6799cc6e15112588bf..755f0ba735b73c0b96ba7f756d843f15ec9ea3d1 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -710,6 +710,22 @@ </entityParameter> </children> </entityConsumer> + <entityConsumer> + <name>LogHistoryConsumer</name> + <title>LogHistory</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>LogHistory_entity</entityName> + <fieldName>LogHistoryProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>tablenames_param</name> + <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..f6fdb0fbfa306482f48611c8049f39fb20a854a3 --- /dev/null +++ b/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js @@ -0,0 +1,10 @@ +import("system.vars"); +import("system.result"); +import("Context_lib"); + +var res = []; +res.push({id: vars.get("$field.OFFERID"), tableNames: ["AB_ATTRIBUTERELATION", "OFFERITEM"]}); +res.push({id: vars.get("$field.OFFERID"), tableNames: ["OFFER"]}); + +res = JSON.stringify(res);//currently only strings can be passed as param +result.object(res); \ No newline at end of file diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index 197dad83f612a49af47bf090e9f4e9bddee8ffda..8a4cf52a03ce05e95133050fff37c21da38d470e 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -476,6 +476,22 @@ </entityParameter> </children> </entityConsumer> + <entityConsumer> + <name>LogHistoryConsumer</name> + <title>LogHistory</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>LogHistory_entity</entityName> + <fieldName>LogHistoryProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>tablenames_param</name> + <valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..b5acc0e5c7cd1d3b12b79af369bdeb74e5b2fce2 --- /dev/null +++ b/entity/Order_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js @@ -0,0 +1,10 @@ +import("system.vars"); +import("system.result"); +import("Context_lib"); + +var res = []; +res.push({id: vars.get("$field.SALESORDERID"), tableNames: ["AB_ATTRIBUTERELATION", "SALESORDERITEM", "PRODUCT"]}); +res.push({id: vars.get("$field.SALESORDERID"), tableNames: ["SALESORDER"]}); + +res = JSON.stringify(res);//currently only strings can be passed as param +result.object(res); \ No newline at end of file diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index d90fa0affa858861d6744471be0936bf23d77788..b54bd697da13984f058b6425061ddf76ada17116 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -452,6 +452,22 @@ <name>DATE_EDIT</name> <valueProcess>%aditoprj%/entity/Product_entity/entityfields/date_edit/valueProcess.js</valueProcess> </entityField> + <entityConsumer> + <name>LogHistoryConsumer</name> + <title>LogHistory</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>LogHistory_entity</entityName> + <fieldName>LogHistoryProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>tablenames_param</name> + <valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..7ba31ad1ef4e48a4004091b122ef98b05f98db8d --- /dev/null +++ b/entity/Product_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js @@ -0,0 +1,10 @@ +import("system.vars"); +import("system.result"); +import("Context_lib"); + +var res = []; +res.push({id: vars.get("$field.PRODUCTID"), tableNames: ["AB_ATTRIBUTERELATION", "PRODUCTPRICE", "ORGANISATION"]}); // TEXTBLOCK missing +res.push({id: vars.get("$field.PRODUCTID"), tableNames: ["PRODUCT"]}); + +res = JSON.stringify(res);//currently only strings can be passed as param +result.object(res); \ No newline at end of file diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index cf5b6fcfaf15f937f6732b64d3ae57535c33a3d6..a2d4867480daf7a69d3d79370aa38c0c179f6a98 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -599,6 +599,22 @@ </entityParameter> </children> </entityConsumer> + <entityConsumer> + <name>LogHistoryConsumer</name> + <title>LogHistory</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>LogHistory_entity</entityName> + <fieldName>LogHistoryProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>tablenames_param</name> + <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js b/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..97523412f94b7d77b72b9a0973be454ca2a0bf04 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js @@ -0,0 +1,10 @@ +import("system.vars"); +import("system.result"); +import("Context_lib"); + +var res = []; +res.push({id: vars.get("$field.SALESPROJECTID"), tableNames: ["AB_ATTRIBUTERELATION", "ACTIVITY"]}); +res.push({id: vars.get("$field.SALESPROJECTID"), tableNames: ["SALESPROJECT"]}); + +res = JSON.stringify(res);//currently only strings can be passed as param +result.object(res); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 7d36afb0e90d471b736369839c52c5c941ce25c6..07ad9a57cc2d69790548686553c495788217e0e4 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -3087,6 +3087,9 @@ <entry> <key>per</key> </entry> + <entry> + <key>The minimal count can't be larger than the maximal count!</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 9cf86e4d198b59e2e21eb96a77af237823de7d5e..c603e512826f5e65a44b160e212262d517a58966 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -3122,6 +3122,9 @@ <entry> <key>per</key> </entry> + <entry> + <key>The minimal count can't be larger than the maximal count!</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod index bc76e90e0617ea97e8df8b7e2a17aa0555055a0e..540b3053f6b23d18eb9e8e7d1558140feaa8c9ed 100644 --- a/neonView/OrderMain_view/OrderMain_view.aod +++ b/neonView/OrderMain_view/OrderMain_view.aod @@ -44,5 +44,10 @@ <entityField>Documents</entityField> <view>DocumentFilter_view</view> </neonViewReference> + <neonViewReference> + <name>b0dea506-7dd9-4de9-9ebe-ecad9965c300</name> + <entityField>LogHistoryConsumer</entityField> + <view>LogHistoryFilter_view</view> + </neonViewReference> </children> </neonView>