diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js index 54c6e810026576c01cf069b5170c47972ab83fa5..7cecd3b427054a5a7558dcc24adaf976c33bc034 100644 --- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js +++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js @@ -2,8 +2,5 @@ import("system.vars"); import("system.result"); import("Keyword_lib"); -var histMedium; -histMedium = vars.get("$field.CATEGORY"); -if (histMedium){ - result.string(vars.get("$field.SUBJECT") + " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")"); -} \ No newline at end of file +var histMedium = vars.get("$field.CATEGORY"); +result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")" : "")); diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod index 040d0cff489e1e480b7261fd88cba2420b76f078..028d790dd26fa08b59c9e9fcb010c6ebaf5745f7 100644 --- a/entity/Contract_entity/Contract_entity.aod +++ b/entity/Contract_entity/Contract_entity.aod @@ -259,6 +259,13 @@ </entityParameter> </children> </entityConsumer> + <entityActionField> + <name>newActivity</name> + <fieldType>ACTION</fieldType> + <title>New activity</title> + <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess> + <iconId>NEON:HISTORY</iconId> + </entityActionField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Contract_entity/entityfields/newactivity/onActionProcess.js b/entity/Contract_entity/entityfields/newactivity/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..5d64774798acd58cd8c536f765182b5e9e94b7ff --- /dev/null +++ b/entity/Contract_entity/entityfields/newactivity/onActionProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("Activity_lib"); + +ActivityUtils.createNewActivity(vars.getString("$field.CONTRACTID")); \ No newline at end of file diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index 20b766fbc3c0ecba1a00e12512f33f64709e3dd2..2297b80962e45811beb9c262263d9d95d4f110c0 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -388,6 +388,13 @@ </entityParameter> </children> </entityConsumer> + <entityActionField> + <name>newActivity</name> + <fieldType>ACTION</fieldType> + <title>New activity</title> + <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess> + <iconId>NEON:HISTORY</iconId> + </entityActionField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..d93e51415984160000410db0d04359823d7ceaa4 --- /dev/null +++ b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("Activity_lib"); + +ActivityUtils.createNewActivity(vars.getString("$field.OFFERID")); \ No newline at end of file diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index 45c68993e43e0dd1422427ab981999013747dbaf..4afb6c516c1caa25aecd7211b004f98488fdce70 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -378,6 +378,13 @@ </entityParameter> </children> </entityConsumer> + <entityActionField> + <name>newActivity</name> + <fieldType>ACTION</fieldType> + <title>New activity</title> + <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess> + <iconId>NEON:HISTORY</iconId> + </entityActionField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Order_entity/entityfields/newactivity/onActionProcess.js b/entity/Order_entity/entityfields/newactivity/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..0dfbcbcb9f63def6b709cc3ccfc54b72f6ac116b --- /dev/null +++ b/entity/Order_entity/entityfields/newactivity/onActionProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("Activity_lib"); + +ActivityUtils.createNewActivity(vars.getString("$field.SALESORDERID")); \ No newline at end of file diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index 674f22c4d724048e0a928f8b6243f05567d80006..d2902bb8988c83b2ea5721dabfdf8350f3a422b2 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -310,6 +310,13 @@ </entityParameter> </children> </entityConsumer> + <entityActionField> + <name>newActivity</name> + <fieldType>ACTION</fieldType> + <title>New activity</title> + <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess> + <iconId>NEON:HISTORY</iconId> + </entityActionField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Product_entity/entityfields/newactivity/onActionProcess.js b/entity/Product_entity/entityfields/newactivity/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..b2be977254ab92678a76d702b47f2de59d379a37 --- /dev/null +++ b/entity/Product_entity/entityfields/newactivity/onActionProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("Activity_lib"); + +ActivityUtils.createNewActivity(vars.getString("$field.PRODUCTID")); \ No newline at end of file diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 187aeefd5659a4287be44398fc10894bdb9d090f..93027687026652ae17e3034af4d629ac96fbf99b 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -387,6 +387,13 @@ </entityParameter> </children> </entityConsumer> + <entityActionField> + <name>newActivity</name> + <fieldType>ACTION</fieldType> + <title>New activity</title> + <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess> + <iconId>NEON:HISTORY</iconId> + </entityActionField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js b/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..0a299b330a3c72d55249e6bd6d52a51512d0867b --- /dev/null +++ b/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("Activity_lib"); + +ActivityUtils.createNewActivity(vars.getString("$field.SALESPROJECTID")); \ No newline at end of file