diff --git a/workflow/engine/classes/class.xmlfield_InputPM.php b/workflow/engine/classes/class.xmlfield_InputPM.php
index e44b35d38..5632e4f73 100755
--- a/workflow/engine/classes/class.xmlfield_InputPM.php
+++ b/workflow/engine/classes/class.xmlfield_InputPM.php
@@ -373,11 +373,11 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
  * @param eter boolean $bSystemVars
  * @return array
  */
-function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields = 0)
+function getDynaformsVars ($sProcessUID, $typeVars = 'all', $bIncMulSelFields = 0)
 {
     $aFields = array ();
     $aFieldsNames = array ();
-    if ($bSystemVars) {
+    if ($typeVars == 'system' || $typeVars == 'all') {
         $aAux = G::getSystemConstants();
         foreach ($aAux as $sName => $sValue) {
             $aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLES'));
@@ -401,21 +401,52 @@ function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields
     $oDataset->next();
     $row = $oDataset->getRow();
     if (isset($row["PRJ_UID"])) {
-        $oCriteria = new Criteria('workflow');
-        $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_UID);
-        $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME);
-        $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE);
-        $oCriteria->add(ProcessVariablesPeer::PRJ_UID, $sProcessUID);
-        $oDataset = DynaformPeer::doSelectRS($oCriteria);
-        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        while ($oDataset->next()) {
-            $row = $oDataset->getRow();
-            array_push($aFields, array(
-                "sName" => $row["VAR_NAME"],
-                "sType" => $row["VAR_FIELD_TYPE"],
-                "sLabel" => $row["VAR_NAME"] . " [" . $row["VAR_FIELD_TYPE"] . "]"
-            ));
+        if($typeVars == 'process' || $typeVars == 'all') {
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_UID);
+            $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME);
+            $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE);
+            $oCriteria->add(ProcessVariablesPeer::PRJ_UID, $sProcessUID);
+            $oDataset = DynaformPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            while ($oDataset->next()) {
+                $row = $oDataset->getRow();
+                array_push($aFields, array(
+                    "sName" => $row["VAR_NAME"],
+                    "sType" => $row["VAR_FIELD_TYPE"],
+                    "sLabel" => $row["VAR_NAME"] . " [" . $row["VAR_FIELD_TYPE"] . "]"
+                ));
+            }
+        } 
+        if($typeVars == 'grid' || $typeVars == 'all') {
+            $oC = new Criteria( 'workflow' );
+            $oC->addSelectColumn( DynaformPeer::DYN_CONTENT );
+            $oC->add( DynaformPeer::PRO_UID, $sProcessUID );
+            $oC->add( DynaformPeer::DYN_TYPE, 'xmlform' );
+            $oData = DynaformPeer::doSelectRS( $oC );
+            $oData->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oData->next();
+            while ($aRowd = $oData->getRow()) {
+                $dynaform = G::json_decode($aRowd['DYN_CONTENT'],true);
+                $items = $dynaform['items'][0]['items'];
+                foreach($items as $key => $val){
+                    if($val[0]['type'] == 'grid'){
+                        if(sizeof($val[0]['columns'])) {
+                            $columns = $val[0]['columns'];
+                            foreach($columns as $column) {
+                                array_push($aFields, array(
+                                    "sName" => $column['name'],
+                                    "sType" => $column['dataType'],
+                                    "sLabel" => $column['name'] . " [" . $column['dataType']. "]"
+                                ));
+                            }
+                        }
+                    }
+                }
+                $oData->next();
+            }
         }
+        
     } else {
         require_once 'classes/model/Dynaform.php';
         $oCriteria = new Criteria( 'workflow' );
diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php
index a00050846..157246242 100755
--- a/workflow/engine/methods/controls/varsAjax.php
+++ b/workflow/engine/methods/controls/varsAjax.php
@@ -66,6 +66,7 @@ $html .= '<select name="type_variables" id="type_variables">';
 $html .= '<option value="all">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_ALL_VARIABLES' )).'</option>';
 $html .= '<option value="system">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_SYSTEM_VARIABLES' )).'</option>';
 $html .= '<option value="process">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_PROCESS_VARIABLES' )).'</option>';
+$html .= '<option value="grid">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_GRID_VARIABLES' )).'</option>';
 $html .= '</select> &nbsp;&nbsp;&nbsp;&nbsp;';
 $html .= '</td>';
 
diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index 17a4ab221..cbb76bd70 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -806,15 +806,21 @@ try {
             G::LoadClass('xmlfield_InputPM');
             $proUid = isset($_REQUEST['process']) ? $_REQUEST['process'] : '';
             $queryText = isset($_REQUEST['queryText']) ? $_REQUEST['queryText'] : '';
-            if ($_REQUEST['type'] == 'system') {
-                $isSystem = true;
-            } else {
-                $isSystem = false;
+            switch($_REQUEST['type']) {
+                case 'system';
+                    $typeVars = $_REQUEST['type'];
+                break;
+                case 'process';
+                    $typeVars = $_REQUEST['type'];
+                break;
+                case 'grid';
+                    $typeVars = $_REQUEST['type'];
+                break;     
             }
             if ($_REQUEST['type'] == 'all') {
                 $aFields = getDynaformsVars($proUid);
             } else {
-                $aFields = getDynaformsVars($proUid, $isSystem, isset($_REQUEST['bIncMulSelFields']) ? $_REQUEST['bIncMulSelFields'] : 1);
+                $aFields = getDynaformsVars($proUid, $typeVars, isset($_REQUEST['bIncMulSelFields']) ? $_REQUEST['bIncMulSelFields'] : 1);
             }
             $aVariables = array();