diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index 3d4728ef0..147d3d131 100755
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -1611,6 +1611,35 @@ class pmTablesProxy extends HttpProxyController
                 }
                 $oDataset->next();
             }
+            
+            // getting bpmn projects
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(BpmnProcessPeer::PRJ_UID);
+            $oCriteria->add(BpmnProcessPeer::PRJ_UID, $proUid);
+            $oDataset = BpmnProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $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, $row["PRJ_UID"]);
+                $oDataset = ProcessVariablesPeer::doSelectRS($oCriteria);
+                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                $index = 0;
+                while ($oDataset->next()) {
+                    $row = $oDataset->getRow();
+                    array_push($fields, array(
+                        "FIELD_UID" => $row["VAR_NAME"] . "-" . $row["VAR_FIELD_TYPE"],
+                        "FIELD_NAME" => $row["VAR_NAME"],
+                        "FIELD_VALIDATE" => "any",
+                        "_index" => $index ++,
+                        "_isset" => true
+                    ));
+                }
+            }
 
             sort( $fields );
 
diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index fc88597d1..603960af0 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -1667,6 +1667,31 @@ function mapPMFieldType(id)
         sizeField='255';
         break;
 
+      case 'string':
+        typeField='VARCHAR';
+        sizeField='255';
+        break;
+      case 'integer':
+        typeField='INTEGER';
+        sizeField='11';
+        break;
+      case 'float':
+        typeField='FLOAT';
+        sizeField='11';
+        break;
+    case 'boolean':
+        typeField='INTEGER';
+        sizeField='1';
+        break;
+    case 'date':
+        typeField='VARCHAR';
+        sizeField='255';
+        break;
+    case 'datetime':
+        typeField='VARCHAR';
+        sizeField='255';
+        break;
+
       default:
         typeField='TEXT';
         sizeField='';