diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index b65235cda..e909172ac 100755
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -386,6 +386,7 @@ class pmTablesProxy extends HttpProxyController
     $this->className = $table['ADD_TAB_CLASS_NAME'];
     $this->classPeerName = $this->className . 'Peer';
     $row = (array) $rows;
+    $row = array_merge(array_change_key_case($row, CASE_LOWER), array_change_key_case($row, CASE_UPPER));
     $toSave = false;
 
     if (!file_exists (PATH_WORKSPACE . 'classes/' . $this->className . '.php') ) {
@@ -396,32 +397,27 @@ class pmTablesProxy extends HttpProxyController
     eval('$obj = new ' .$this->className. '();');
 
     if (count($row) > 0) {
-      try {
-        eval('$con = Propel::getConnection('.$this->classPeerName.'::DATABASE_NAME);');
-        $con->begin();
-        $obj->fromArray($row, BasePeer::TYPE_FIELDNAME);
+      eval('$con = Propel::getConnection('.$this->classPeerName.'::DATABASE_NAME);');
+      $con->begin();
+      $obj->fromArray($row, BasePeer::TYPE_FIELDNAME);
 
-        if ($obj->validate()) {
-          $obj->save();
-          $toSave = true;
-            
-          $primaryKeysValues = array();
-          foreach ($primaryKeys as $primaryKey) {
-            $method = 'get' . AdditionalTables::getPHPName($primaryKey['FLD_NAME']);
-            $primaryKeysValues[] = $obj->$method();
-          }
+      if ($obj->validate()) {
+        $obj->save();
+        $toSave = true;
+          
+        $primaryKeysValues = array();
+        foreach ($primaryKeys as $primaryKey) {
+          $method = 'get' . AdditionalTables::getPHPName($primaryKey['FLD_NAME']);
+          $primaryKeysValues[] = $obj->$method();
         }
-        else {
-          foreach($obj->getValidationFailures() as $objValidationFailure) {
-             $msg .= $objValidationFailure->getMessage() . "\n";
-          }
-          throw new PropelException($msg);
-        }
-      } 
-      catch(Exception $e) {
-         $con->rollback();
-         throw new Exception($e->getMessage());
       }
+      else {
+        foreach($obj->getValidationFailures() as $objValidationFailure) {
+           $msg .= $objValidationFailure->getMessage() . "\n";
+        }
+        throw new PropelException($msg);
+      }
+      
       $index = G::encrypt(implode('-', $primaryKeysValues), 'pmtable');
     } 
     else {
diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js
index bdaa33997..42c3512db 100755
--- a/workflow/engine/templates/pmTables/data.js
+++ b/workflow/engine/templates/pmTables/data.js
@@ -25,7 +25,8 @@ Ext.onReady(function(){
   newButton = new Ext.Action({
     text    : _('ID_ADD_ROW'),
     iconCls : 'button_menu_ext ss_sprite ss_add',
-    handler : NewPMTableRow
+    handler : NewPMTableRow,
+    disabled: (isReport ? true : false)
   });
   
   editButton = new Ext.Action({
@@ -121,12 +122,12 @@ Ext.onReady(function(){
          case 1:
            if (!isReport) {
              editButton.enable();
+             deleteButton.enable();
            }
-           deleteButton.enable();
            break;
          default:
            editButton.disable();
-           //deleteButton.disable();
+           deleteButton.disable();
            break;
          }
        }