diff --git a/workflow/engine/methods/login/version-pmos.php b/workflow/engine/methods/login/version-pmos.php
index bb91b461e..c4a2a844f 100644
--- a/workflow/engine/methods/login/version-pmos.php
+++ b/workflow/engine/methods/login/version-pmos.php
@@ -1,5 +1,5 @@
-<?php
-if (!defined('PM_VERSION')) {
-   define("PM_VERSION", "3.3.0-community-RE-2.4");
-   define("PM_BUILD_VERSION", "3.3.0-community-RE-2.4");
-}
+<?php
+if (!defined('PM_VERSION')) {
+   define("PM_VERSION", "3.3.0-community-RE-2.5");
+   define("PM_BUILD_VERSION", "3.3.0-community-RE-2.5");
+}
diff --git a/workflow/public_html/glpi/glpi.js b/workflow/public_html/glpi/glpi.js
index 9371b0cd3..0c67b2df6 100644
--- a/workflow/public_html/glpi/glpi.js
+++ b/workflow/public_html/glpi/glpi.js
@@ -204,7 +204,7 @@ pm_glpi = {
    tasks_observer: function (mutationList, observer) {
 
       // hide dyn_forward_assign when it is the last step in the task
-      let dyn_forward_assign = document.querySelector('a[id*="dyn_forward" i][href="cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN"]');
+      let dyn_forward_assign = document.querySelector('a[id*="dyn_forward" i][href*="cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN"]');
       if (dyn_forward_assign && dyn_forward_assign.style.display != 'none') {
          dyn_forward_assign.style.display = 'none';
       }
diff --git a/workflow/public_html/glpi/glpi_helpers_bpmn.js b/workflow/public_html/glpi/glpi_helpers_bpmn.js
index b5d9d0206..8908601bf 100644
--- a/workflow/public_html/glpi/glpi_helpers_bpmn.js
+++ b/workflow/public_html/glpi/glpi_helpers_bpmn.js
@@ -1,342 +1,413 @@
 glpi = {
-	
+
 	// Grid helpers
-   deleteGridRows: function ( gridName ) {
-		var grd = getFieldById(gridName) ;
-		var tot = grd.getNumberRows() ;
-		for(var i = tot; i > 0; i-- ) {
+	deleteGridRows: function (grd) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var tot = grd.getNumberRows();
+		for (var i = tot; i > 0; i--) {
 			grd.deleteRow(i);
-		};		
+		};
 	},
 
-	selectAll: function ( gridName, colName, select ) {
-		var grd = getFieldById(gridName) ;
-		var colNum = this.getColNum( gridName, colName ) ;
-		for(var i=1; i<=grd.getNumberRows() && colNum>0; i++){
-			//debugger ;
-			//if( grd.getValue( i, colNum ) != select ) {
-				grd.setValue( select, i, colNum ) ;
-				$(grd.gridtable[i-1][colNum-1].el).change(); // to trigger change
-			//}
+	selectAll: function (grd, colName, select) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var colNum = this.getColNum(grd, colName);
+		for (var i = 1; i <= grd.getNumberRows() && colNum > 0; i++) {
+			grd.setValue(select, i, colNum);
+			$(grd.gridtable[i - 1][colNum - 1].el).change(); // to trigger change
 		}
 	},
 
-	selectRow: function (gridName, colName, select, rowIdx) {
-	   var grd = getFieldById(gridName);
-	   var colNum = this.getColNum(gridName, colName);
-	   grd.setValue(select, rowIdx, colNum);
-	   $(grd.gridtable[rowIdx - 1][colNum - 1].el).change(); // to trigger change
+	selectRow: function (grd, colName, select, rowIdx) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var colNum = this.getColNum(grd, colName);
+		grd.setValue(select, rowIdx, colNum);
+		$(grd.gridtable[rowIdx - 1][colNum - 1].el).change(); // to trigger change
 	},
 
-	selectWithCallback: function (gridName, colName, select, callback_filter) {
-	   var grd = getFieldById(gridName);
-	   var colNum = this.getColNum(gridName, colName);
-	   for (var i = 1; i <= grd.getNumberRows() && colNum > 0; i++) {
-	      //debugger ;
-	      var toBeChanged = callback_filter(glpi.getGridRow(gridName, i));
-	      if (toBeChanged) {// && grd.getValue(i, colNum) != select) {
-	         grd.setValue(select, i, colNum);
-	         $(grd.gridtable[i - 1][colNum - 1].el).change(); // to trigger change
-	      }
-	   }
+	selectWithCallback: function (grd, colName, select, callback_filter) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var colNum = this.getColNum(grd, colName);
+		if (colNum > 0) {
+			var elts = this.getGridRows(grd);
+			elts.forEach((e, i) => {
+				var toBeChanged = callback_filter(e);
+				if (toBeChanged) {
+					grd.setValue(select, i + 1, colNum);
+					$(grd.gridtable[i][colNum - 1].el).change(); // to trigger change
+				}
+			});
+		}
 	},
-		
-	getColNum: function (gridName, colName) {
-		var grd = getFieldById(gridName) ;
-		for(var i= 0; i < grd.columnsModel.length; i++ ){
-			if( grd.columnsModel[i].columnName == colName ) {
-				return i + 1 ;
+
+	getColNum: function (grd, colName) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		for (var i = 0; i < grd.columnsModel.length; i++) {
+			if (grd.columnsModel[i].columnName == colName) {
+				return i + 1;
 			}
 		}
-		return false ;
+		return false;
 	},
 
-	getColsNums: function (gridName) {
-	   var grd = getFieldById(gridName);
-	   var ret = {};
-	   for (var i = 0; i < grd.columnsModel.length; i++) {
-	      ret[grd.columnsModel[i].columnName] = i + 1;
-	   }
-	   return ret;
+	getColsNums: function (grd) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var ret = {};
+		for (var i = 0; i < grd.columnsModel.length; i++) {
+			ret[grd.columnsModel[i].columnName] = i + 1;
+		}
+		return ret;
 	},
 
-	
-	jq: function( myid ) {
-    return "#" + myid.replace( /(:|\.|\[|\]|,|=|@)/g, "\\$1" );
+
+	jq: function (myid) {
+		return "#" + myid.replace(/(:|\.|\[|\]|,|=|@)/g, "\\$1");
 	},
-	
-	addGridRow:	function ( gridName, oRow ) {
-		var grd = getFieldById(gridName)
-		var aData = [] ;
+
+	addGridRow: function (grd, oRow) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var aData = [];
 		// debugger;
-		for(var i = 0; i < grd.columnsModel.length; i++) {
-			aData.push( {value: oRow[grd.columnsModel[i].columnName]} ) ;
+		for (var i = 0; i < grd.columnsModel.length; i++) {
+			aData.push({ value: oRow[grd.columnsModel[i].columnName] });
 		}
-		
-		grd.addRow( aData ) ;
+
+		grd.addRow(aData);
 	},
-					
-	find: function(elts, hookfct, thisValue){
-	   var stop = false;
-	   for (var i = 0; i < elts.length && !stop; i++) {
-	      stop = hookfct(elts[i], thisValue, i);
-	   }
+
+	find: function (elts, hookfct, thisValue) {
+		var stop = false;
+		for (var i = 0; i < elts.length && !stop; i++) {
+			stop = hookfct(elts[i], thisValue, i);
+		}
 		return stop;
 	},
 
 	findIndex: function (elts, hookfct, thisValue) {
-	   for (var i = 0; i < elts.length; i++) {
-	      if (hookfct(elts[i], thisValue, i)) {
-	         return i;
-	      }
-	   }
-	   return -1;
+		for (var i = 0; i < elts.length; i++) {
+			if (hookfct(elts[i], thisValue, i)) {
+				return i;
+			}
+		}
+		return -1;
 	},
 
-	//asyncLoop: function (index, maxIndex, endCallback, toDoCallback) {
-	//   setTimeout(function () {
-	//      if (index < maxIndex) {
-	//         toDoCallback(arguments);
-	//         //that.addGridRow(gridName, elts[i]);
-	//         index++;
-	//         asyncLoop(index);
-	//      } else {
-	//         endCallback();
-	//      }
-	//   }, 0);
-	//},
-
-	setGridRowsAsync: function (gridName, elts, callback) {
-	   var that = this;
-	   function asyncLoop(i) {
-	      setTimeout(function () {
-	         if (i < elts.length) {
-	            that.addGridRow(gridName, elts[i]);
-	            i++;
-	            asyncLoop(i);
-	         } else {
-	            callback();
-	         }
-	      }, 0);
-	   }
-      // start asyncLoop
-	   asyncLoop(0);
+	setGridRowsAsync: function (grd, elts, callback) {
+		var that = this;
+		function asyncLoop(i) {
+			setTimeout(function () {
+				if (i < elts.length) {
+					that.addGridRow(grd, elts[i]);
+					i++;
+					asyncLoop(i);
+				} else {
+					callback();
+				}
+			}, 0);
+		}
+		// start asyncLoop
+		asyncLoop(0);
 	},
 
-	setGridRows: function( gridName, elts) { 
-	   //debugger;
-	   for (var i = 0; i < elts.length; i++) {
-	      this.addGridRow(gridName, elts[i]);
-	   }
+	setGridRows: function (grd, elts) {
+		//debugger;
+		for (var i = 0; i < elts.length; i++) {
+			this.addGridRow(grd, elts[i]);
+		}
 	},
 
-	getGridRow: function( gridName, iRow ){
-		var grd = getFieldById(gridName) ;
-		var elt = {};
-		for (var f = 0; f < grd.columnsModel.length; f++) {
-			elt[grd.columnsModel[f].columnName] = grd.getValue(iRow, f + 1) ; 
+	getGridRow: function (grd, iRow) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
 		}
-		return elt ;
+		var data = grd.getData().gridtable[iRow - 1];
+		var elt = {};
+		data.forEach((f) => {
+			if (f.name) {
+				elt[f.name] = Array.isArray(f.value) ? f.value[0] : f.value;
+			}
+		});
+		return elt;
 	},
 
-	getGridRows: function( gridName ) { 
-		var grd = getFieldById(gridName) ;
-		var tot = grd.getNumberRows(); 
-		var elts = [] ;
-		for (var i = 1; i <= tot; i++) {
-			elts.push(this.getGridRow(gridName, i));
+	getGridRows: function (grd) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
 		}
+		var data = grd.getData().gridtable;
+		var elts = [];
+		data.forEach((e) => {
+			var elt = {};
+			e.forEach((f) => {
+				if (f.name) {
+					elt[f.name] = Array.isArray(f.value) ? f.value[0] : f.value;
+				}
+			});
+			elts.push(elt);
+		});
 		return elts;
-	},			
-	
-	gridCountRows: function(gridName) {
-		//debugger;
-		return getFieldById(gridName).getNumberRows() ;
 	},
-	
-	initGrid: function(gridName, colName) {
-		//debugger ;
-		var grd = getFieldById(gridName) ;
-		var colNum = this.getColNum( gridName, colName) ;
-		if( grd.getNumberRows() == 1 && grd.getValue( 1, colNum ) == '') {
+
+	gridCountRows: function (grd) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		return grd.getNumberRows();
+	},
+
+	initGrid: function (grd, colName) {
+		if (typeof grd === 'string') {
+			grd = getFieldById(grd);
+		}
+		var colNum = this.getColNum(grd, colName);
+		if (grd.getNumberRows() == 1 && grd.getValue(1, colNum) == '') {
 			grd.deleteRow(1);
 		};
-	}, 
+	},
 
 	// CSS and class helpers
-   getCSSRules: function (selector, sheet) {
-      var results = new Array() ;
-      var sheets = typeof sheet !== 'undefined' ? [sheet] : document.styleSheets;
-      selector = '.' + selector;
-      for (var i = 0, l = sheets.length; i < l; i++) {
-         var sheet = sheets[i];
-         if( !sheet.cssRules ) { continue; }
-         for (var j = 0, k = sheet.cssRules.length; j < k; j++) {
-            var rule = sheet.cssRules[j];
-            if (rule.selectorText && rule.selectorText.split(',').indexOf(selector) !== -1) {
-               results.push( rule );
-            }
-         }
-      }
-      return results;
-   },
-
-   setClassAttribute: function (className, attrName, value) {
-      var rules = glpi.getCSSRules(className);
-      for (var i = 0, l = rules.length; i < l; i++) {
-         rules[i].style[attrName] = value;
-      }
-   },
-	
+	getCSSRules: function (selector, sheet) {
+		var results = new Array();
+		var sheets = typeof sheet !== 'undefined' ? [sheet] : document.styleSheets;
+		selector = '.' + selector;
+		for (var i = 0, l = sheets.length; i < l; i++) {
+			var sheet = sheets[i];
+			if (!sheet.cssRules) { continue; }
+			for (var j = 0, k = sheet.cssRules.length; j < k; j++) {
+				var rule = sheet.cssRules[j];
+				if (rule.selectorText && rule.selectorText.split(',').indexOf(selector) !== -1) {
+					results.push(rule);
+				}
+			}
+		}
+		return results;
+	},
+
+	setClassAttribute: function (className, attrName, value) {
+		var rules = glpi.getCSSRules(className);
+		for (var i = 0, l = rules.length; i < l; i++) {
+			rules[i].style[attrName] = value;
+		}
+	},
+
 	// Dialog helpers
 	// Create the dialog with "Yes" and "No" buttons:
-   showConfirmDlg: function (title, content, yestext, notext, callback, position) {
-      //debugger;
-      return glpi.showMultiBtnDlg(title, content, [{ text: yestext, val: true }, { text: notext, val: false }], callback, position);
-   },
-
-   // Create a dialog with several buttons:
-   showMultiBtnDlg: function (title, content, buttons, callback, position) {
-      // buttons is an array of the form
-      // [ {text: 'Yes', val:  1},
-      //   {text: 'No', val: 0},
-      //   {text: 'May be', val: -1}
-      // ]
-      var locParent = window.document;
-      var parentScrollTop = $(locParent).scrollTop();
-
-      if (!position) {
-         position = {};
-      }
-
-      var locButtons = [];
-      buttons.forEach(function (item, index) {
-         locButtons.push({
-            text: item.text,
-            click: function () {
-               $(this).dialog('close');
-               callback(item.val);
-            }
-         });
-      });
-      var dlgContents = {
-         title: title,
-         modal: true,
-         resizable: false,
-         buttons: locButtons,
-         close: function (event, ui) {
-            $(locParent).find('html, body').animate({
-               scrollTop: parentScrollTop
-            }, 1000);
-         },
-         position: position,
-         show: true,
-         hide: true
-      }
-
-      var locDlg = $("<div></div>").html(content).dialog(dlgContents);
-
-      $(locParent).find('html, body').animate({
-         scrollTop: locDlg.offset().top
-      }, 1000);
-
-      return locDlg;
-   },
+	showConfirmDlg: function (title, content, yestext, notext, callback, position) {
+		//debugger;
+		return glpi.showMultiBtnDlg(title, content, [{ text: yestext, val: true }, { text: notext, val: false }], callback, position);
+	},
+
+	// Create a dialog with several buttons:
+	showMultiBtnDlg: function (title, content, buttons, callback, position) {
+		// buttons is an array of the form
+		// [ {text: 'Yes', val:  1},
+		//   {text: 'No', val: 0},
+		//   {text: 'May be', val: -1}
+		// ]
+		var locParent = window.document;
+		var parentScrollTop = $(locParent).scrollTop();
+
+		if (!position) {
+			position = {};
+		}
+
+		var locButtons = [];
+		buttons.forEach(function (item, index) {
+			locButtons.push({
+				text: item.text,
+				click: function () {
+					$(this).dialog('close');
+					callback(item.val);
+				}
+			});
+		});
+		var dlgContents = {
+			title: title,
+			modal: true,
+			resizable: false,
+			buttons: locButtons,
+			close: function (event, ui) {
+				$(locParent).find('html, body').animate({
+					scrollTop: parentScrollTop
+				}, 1000);
+			},
+			position: position,
+			show: true,
+			hide: true
+		}
+
+		var locDlg = $("<div></div>").html(content).dialog(dlgContents);
+
+		$(locParent).find('html, body').animate({
+			scrollTop: locDlg.offset().top
+		}, 1000);
+
+		return locDlg;
+	},
 
 
 	// Create the dialog with "Ok" button
-   showInfoDlg: function (title, content, oktext, elementOrPosition) {
-	   var locParent = window.document;
-	   var parentScrollTop = $(locParent).scrollTop();
-
-	   if (!elementOrPosition || (elementOrPosition instanceof jQuery && elementOrPosition.length == 0)) {
-	      position = { my: "top", at: "bottom", of: $('html, body') };
-	   } 
-	   else if (elementOrPosition instanceof jQuery) {
-	      position = { my: "top", at: "bottom", of: elementOrPosition };
-	   } else {
-	      position = elementOrPosition;
-	   }
-
-
-	   var dlgContents = {
-		  title: title,   
-		  width: 900,
-		  modal: true,
-		  buttons: [{
+	showInfoDlg: function (title, content, oktext, elementOrPosition) {
+		var locParent = window.document;
+		var parentScrollTop = $(locParent).scrollTop();
+
+		if (!elementOrPosition || (elementOrPosition instanceof jQuery && elementOrPosition.length == 0)) {
+			position = { my: "top", at: "bottom", of: $('html, body') };
+		}
+		else if (elementOrPosition instanceof jQuery) {
+			position = { my: "top", at: "bottom", of: elementOrPosition };
+		} else {
+			position = elementOrPosition;
+		}
+
+
+		var dlgContents = {
+			title: title,
+			width: 900,
+			modal: true,
+			buttons: [{
 				text: oktext,
-				click: function() {
-					 $(this).dialog("close");
+				click: function () {
+					$(this).dialog("close");
 				}
-		  }],
-		  close: function (event, ui) {
-		     $(locParent).find('html, body').animate({
-		        scrollTop: parentScrollTop
-		     }, 1000);
-		  },
-		  position: position,
-		  show: true,
-		  hide: true		  
-	   }
-
-	   var locDlg = $("<div></div>").html(content).dialog(dlgContents);
-
-	   $(locParent).find('html, body').animate({
-	      scrollTop: locDlg.offset().top
-	   }, 1000);
-
-	   return locDlg;
-   },
-
-   showSimpleModalAlert: function(title, content, oktext) {
-     var dlgContents = {
-      title: title,   
-      modal: true,
-      buttons: [{
-         text: oktext,
-         click: function() {
-            $(this).dialog("close");
-         }
-      }],
-      open: function (event, ui) {
-         $('div[aria-describedby*="alertWin"]').css('top','15px');
-      },    
-      show: true,
-         hide: true           
-      }
-      $("<div id=\"alertWin\"></div>").html(content).dialog(dlgContents);
-   },
-
-	
+			}],
+			close: function (event, ui) {
+				$(locParent).find('html, body').animate({
+					scrollTop: parentScrollTop
+				}, 1000);
+			},
+			position: position,
+			show: true,
+			hide: true
+		}
+
+		var locDlg = $("<div></div>").html(content).dialog(dlgContents);
+
+		$(locParent).find('html, body').animate({
+			scrollTop: locDlg.offset().top
+		}, 1000);
+
+		return locDlg;
+	},
+
+	showSimpleModalAlert: function (title, content, oktext) {
+		var dlgContents = {
+			title: title,
+			modal: true,
+			buttons: [{
+				text: oktext,
+				click: function () {
+					$(this).dialog("close");
+				}
+			}],
+			open: function (event, ui) {
+				$('div[aria-describedby*="alertWin"]').css('top', '15px');
+			},
+			show: true,
+			hide: true
+		}
+		$("<div id=\"alertWin\"></div>").html(content).dialog(dlgContents);
+	},
+
+	// Create a dialog with several buttons and a TextArea to input text
+	showInputDlg: function (title, buttons, callback, position) {
+		// buttons is an array of the form
+		// [ {text: 'Yes', val:  1},
+		//   {text: 'No', val: 0},
+		//   {text: 'May be', val: -1}
+		// ]
+		var locParent = window.document;
+		var parentScrollTop = $(locParent).scrollTop();
+
+		if (!position) {
+			position = {};
+		}
+
+		var locButtons = [];
+		buttons.forEach(function (item, index) {
+			locButtons.push({
+				text: item.text,
+				click: function () {
+					$(this).dialog('close');
+					callback(item.val, $('#inputTextArea').val());
+				}
+			});
+		});
+		var dlgContents = {
+			title: title,
+			modal: true,
+			resizable: false,
+			width: 350,
+			buttons: locButtons,
+			close: function (event, ui) {
+				$(locParent).find('html, body').animate({
+					scrollTop: parentScrollTop
+				}, 1000);
+			},
+			position: position,
+			show: true,
+			hide: true
+		}
+
+		$('#inputTextArea').parent().html(''); // to delete any existing inputTextArea instance
+		var locDlg = $("<div></div>").html("<textarea id=inputTextArea rows='10' cols='30'></textarea>").dialog(dlgContents);
+
+		$(locParent).find('html, body').animate({
+			scrollTop: locDlg.offset().top
+		}, 1000);
+
+		return locDlg;
+	},
+
+
 	// Translation helper
-	t: function( str ){
-		var trans = $('#translations option') ;
+	t: function (str) {
+		var trans = $('#translations option');
 		//debugger;
-		for(var i=0; i<trans.length; i++) {
-			if ($(trans[i]).val() == str){
-				return $(trans[i]).text() ;
+		for (var i = 0; i < trans.length; i++) {
+			if ($(trans[i]).val() == str) {
+				return $(trans[i]).text();
 			}
 		};
 		// not found
-		return str ;
+		return str;
 	},
 
-   // suggest helper 
-   suggestSetValueAndText : function(suggestId, value, text) {
-      getFieldById(suggestId).setValue(value);
-      //getFieldById(suggestId).$el.find('input').last().val(value);
-      getFieldById(suggestId).$el.find('input').first().val(text);
-   },
-  
-   suggestDynamicValue : function(suggestId, targetSuggestId){
-      getFieldById(suggestId).executeSuggestQuery(function(data){
-         if (data.length == 1) {
-            glpi.suggestSetValueAndText(suggestId, data[0].value, data[0].text);
-            if (targetSuggestId) {
-               glpi.suggestSetValueAndText(targetSuggestId, data[0].value, data[0].text);
-            }
-         }
-      });
-   }
+	// suggest helper 
+	suggestSetValueAndText: function (suggestId, value, text) {
+		getFieldById(suggestId).setValue(value);
+		//getFieldById(suggestId).$el.find('input').last().val(value);
+		getFieldById(suggestId).$el.find('input').first().val(text);
+	},
+
+	suggestDynamicValue: function (suggestId, targetSuggestId) {
+		getFieldById(suggestId).executeSuggestQuery(function (data) {
+			if (data.length == 1) {
+				glpi.suggestSetValueAndText(suggestId, data[0].value, data[0].text);
+				if (targetSuggestId) {
+					glpi.suggestSetValueAndText(targetSuggestId, data[0].value, data[0].text);
+				}
+			}
+		});
+	},
 
+	chunkArray: function (arr, size) {
+		return arr.length > size
+			? [arr.slice(0, size), ...this.chunkArray(arr.slice(size), size)]
+			: [arr];
+	}
 }
\ No newline at end of file