diff --git a/workflow/engine/classes/triggers/class.pmTalendFunctions.php b/workflow/engine/classes/triggers/class.pmTalendFunctions.php
index 138496ca6..47c1bf968 100755
--- a/workflow/engine/classes/triggers/class.pmTalendFunctions.php
+++ b/workflow/engine/classes/triggers/class.pmTalendFunctions.php
@@ -28,7 +28,9 @@
 
 /**
  *
- * @method Executes a Talend Web Service..
+ * @method
+ *
+ * Executes a Talend Web Service..
  *
  * @name executeTalendWebservice
  * @label Executes a Talend Web Service.
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index 81a806923..9eaefd320 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -363,8 +363,9 @@ class Installer extends Controller
      */
     public function createWorkspace ()
     {
-        if (file_exists($this->path_shared . 'partner.info')) {
-            $_REQUEST['PARTNER_FLAG'] = true;
+        $pathSharedPartner = trim( $_REQUEST['pathShared'] );
+        if (file_exists($pathSharedPartner.'partner.info')) {
+            $_REQUEST['PARTNER_FLAG'] = true;    
         }
         $this->setResponseType( 'json' );
         if ($_REQUEST['db_engine'] == 'mysql') {
@@ -839,7 +840,7 @@ class Installer extends Controller
             $sysConf = System::getSystemConfiguration( $envFile );
 
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
-                $this->buildParternExtras($db_username, $db_password, $_REQUEST['workspace'], SYS_LANG);
+                $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG);
             } else {
                 try {
                     // update the main index file
@@ -1336,9 +1337,9 @@ class Installer extends Controller
         $user = urlencode($username);
         $pass = urlencode($password);
         $lang = urlencode($lang);
-         
+
         $ch = curl_init();
-         
+
         // set URL and other appropriate options
         curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/login/authentication");
         curl_setopt($ch, CURLOPT_HEADER, 0);
@@ -1349,7 +1350,7 @@ class Installer extends Controller
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, "form[USR_USERNAME]=$user&form[USR_PASSWORD]=$pass&form[USER_LANG]=$lang");
         curl_setopt($ch, CURLOPT_TIMEOUT, 90);
-         
+
         $output = curl_exec($ch);
         curl_close($ch);
 
@@ -1358,10 +1359,11 @@ class Installer extends Controller
          */
 
         $ch = curl_init();
+        $postData = array();
 
         // File to upload/post
         $postData['form[LANGUAGE_FILENAME]'] = "@".PATH_CORE."content/translations/processmaker.$lang.po";
-        
+
         curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/languages_Import");
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_VERBOSE, 0);
@@ -1372,26 +1374,29 @@ class Installer extends Controller
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
         curl_setopt($ch, CURLOPT_TIMEOUT, 90);
-        
-         
+
         $output = curl_exec($ch);
         curl_close($ch);
 
         /** 
-         * Upload plugin file
+         * Upload skin file
          */
 
         $ch = curl_init();
+        $postData = array();
 
-        // resolv the plugin name
-        $plugins = glob(PATH_CORE."plugins/*.tar");
-        if (count($plugins) > 0) {
-            $pluginName = $plugins[0];
-            
+        $skins = glob(PATH_CORE."data/partner/*.tar");
+        if (count($skins) > 0) {
+            $skin = $skins[0];
+
+            $postData['overwrite_files'] = "on";
+            $postData['workspace'] = "global";
+            $postData['option'] = "standardupload";
+            $postData['action'] = "importSkin";
             // File to upload/post
-            $postData['form[PLUGIN_FILENAME]'] = "@{$pluginName}";
-            //http://pmos/sysworkflow/en/classic/setup/skin_Ajax
-            curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/pluginsImportFile");
+            $postData['uploadedFile'] = "@".$skin;
+
+            curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/skin_Ajax");
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_VERBOSE, 0);
             curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiefile);
@@ -1404,22 +1409,22 @@ class Installer extends Controller
 
             $output = curl_exec($ch);
             curl_close($ch);
-        } 
+        }
+
+        /**
+         * Upload plugin file
+         */
 
         $ch = curl_init();
+        $postData = array();
+        // resolv the plugin name
+        $plugins = glob(PATH_CORE."plugins/*.tar");
+        if (count($plugins) > 0) {
+            $pluginName = $plugins[0];
 
-        $skins = glob(PATH_CORE."data/partner/*.tar");
-        if (count($skins) > 0) {
-            $skin = $skins[0];
-
-            $postData['overwrite_files'] = "on";
-            $postData['workspace'] = "global";
-            $postData['option'] = "standardupload";
-            $postData['action'] = "importSkin";
             // File to upload/post
-            $postData['uploadedFile'] = "@".$skin;
-            
-            curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/skin_Ajax");
+            $postData['form[PLUGIN_FILENAME]'] = "@{$pluginName}";
+            curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/pluginsImportFile");
             curl_setopt($ch, CURLOPT_HEADER, 0);
             curl_setopt($ch, CURLOPT_VERBOSE, 0);
             curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiefile);
@@ -1428,13 +1433,13 @@ class Installer extends Controller
             curl_setopt($ch, CURLOPT_POST, true);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
-            curl_setopt($ch, CURLOPT_TIMEOUT, 90);        
-            
-            echo $output = curl_exec($ch);
+            curl_setopt($ch, CURLOPT_TIMEOUT, 90);
+
+
+            $output = curl_exec($ch);
             curl_close($ch);
         }
 
     }
 }
 
-
diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js
index 69aa8fa1c..47c7bbe44 100644
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -865,7 +865,7 @@ Ext.onReady ( function() {
   var comboProcess = new Ext.form.ComboBox({
     width         : 180,
     boxMaxWidth   : 200,
-    editable      : true,
+    editable      : false,
     displayField  : 'APP_PRO_TITLE',
     valueField    : 'PRO_UID',
     forceSelection: false,
@@ -941,7 +941,7 @@ Ext.onReady ( function() {
     var comboCategory = new Ext.form.ComboBox({
         width           : 180,
         boxMaxWidth     : 200,
-        editable        : true,
+        editable        : false,
         displayField    : 'CATEGORY_NAME',
         valueField      : 'CATEGORY_UID',
         forceSelection  : false,
@@ -1108,7 +1108,7 @@ Ext.onReady ( function() {
       triggerAction : 'all',
       emptyText : _('ID_ALL_USERS'),
       selectOnFocus : true,
-      editable : true,
+      editable : false,
       width: 180,
       allowBlank : true,
       autocomplete: true,
@@ -1500,6 +1500,7 @@ Ext.onReady ( function() {
     id:'dateFrom',
     format: 'Y-m-d',
     width: 120,
+    editable: false,
     value: ''
   });
 
@@ -1507,6 +1508,7 @@ Ext.onReady ( function() {
     id:'dateTo',
     format: 'Y-m-d',
     width: 120,
+    editable: false,
     value: ''
   });
 
diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js
index 345b3f572..a80d3823d 100755
--- a/workflow/engine/templates/pmTables/data.js
+++ b/workflow/engine/templates/pmTables/data.js
@@ -90,6 +90,11 @@ Ext.onReady(function(){
   _fields.push({name: _idProperty});
 
   for (i=0;i<tableDef.FIELDS.length; i++) {
+    if (tableDef.FIELDS[i].FLD_KEY==1) {
+      blank=false;
+    } else{
+      blank=true;
+    };
     switch (tableDef.FIELDS[i].FLD_TYPE) {
       case 'DATE':
         columnRenderer = function (value) {
@@ -104,7 +109,7 @@ Ext.onReady(function(){
         columnEditor = {
           xtype      : 'datefield',
           format     : 'Y-m-d',
-          allowBlank : true
+          allowBlank : blank
         };
         break;
 
@@ -114,7 +119,7 @@ Ext.onReady(function(){
         columnEditor = {
           xtype      : 'numberfield',
           decimalPrecision : 8,
-          allowBlank : true
+          allowBlank : blank
         };
         break;
 
@@ -123,7 +128,7 @@ Ext.onReady(function(){
         columnAlign = 'left';
         columnEditor = {
           xtype      : 'textfield',
-          allowBlank : true
+          allowBlank : blank
         };
     }
 
@@ -182,13 +187,13 @@ Ext.onReady(function(){
     editor = new Ext.ux.grid.RowEditor({
       saveText  : _("ID_UPDATE"),
       listeners : {
-  	    afteredit : {
-  	      fn:function(rowEditor, obj, data, rowIndex ){
-    		    if (data.phantom === true) {
-    			  //store.reload(); // only if it is an insert
-    	    	}
-  	      }
-  	    }
+        afteredit : {
+          fn:function(rowEditor, obj, data, rowIndex ){
+            if (data.phantom === true) {
+            //store.reload(); // only if it is an insert
+            }
+          }
+        }
       }
     });
   }
@@ -396,12 +401,30 @@ NewPMTableRow = function(){
 
   var row = new PMRow(new props);
   len = infoGrid.getStore().data.length;
-
-  editor.stopEditing();
-  store.insert(len, row);
-  infoGrid.getView().refresh();
-  infoGrid.getSelectionModel().selectRow(len);
-  editor.startEditing(len);
+  if (len>0) {
+      var emptyrow=0;
+      for (var i = 0; i < tableDef.FIELDS.length; i++) {
+        if (infoGrid.store.getAt(len-1).data[tableDef.FIELDS[i].FLD_NAME]=="") {
+          emptyrow++;
+        };
+      };
+      if (emptyrow==tableDef.FIELDS.length) {
+        PMExt.error( _('ID_ERROR'), _('ID_EMPTY_ROW'));
+        store.load();
+      } else{
+        editor.stopEditing();
+        store.insert(len, row);
+        infoGrid.getView().refresh();
+        infoGrid.getSelectionModel().selectRow(len);
+        editor.startEditing(len);
+      }
+    } else{
+      editor.stopEditing();
+      store.insert(len, row);
+      infoGrid.getView().refresh();
+      infoGrid.getSelectionModel().selectRow(len);
+      editor.startEditing(len);
+    }
 };
 
 //Load PM Table Edition Row Form
diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js
index 7ebc5ef20..763f2eaa2 100644
--- a/workflow/engine/templates/users/users.js
+++ b/workflow/engine/templates/users/users.js
@@ -1249,31 +1249,6 @@ function loadUserData()
                 //
             }
 
-            storeCountry.load();
-
-            storeRegion.load({
-                params: {
-                    IC_UID : data.user.USR_COUNTRY
-                }
-            });
-
-            storeLocation.load({
-                params: {
-                    IC_UID : data.user.USR_COUNTRY,
-                    IS_UID : data.user.USR_CITY
-                }
-            });
-
-            storeReplacedBy.load();
-
-            storeCalendar.load();
-
-            storeRole.load();
-
-            storeDefaultMainMenuOption.load();
-
-            storeDefaultCasesMenuOption.load();
-
             comboCountry.store.on("load", function(store) {
                 comboCountry.setValue(data.user.USR_COUNTRY);
             });
@@ -1306,12 +1281,15 @@ function loadUserData()
             if (infoMode) {
                 comboDefaultMainMenuOption.store.on("load", function (store) {
                     comboDefaultMainMenuOption.setValue(data.user.PREF_DEFAULT_MENUSELECTED);
+
+                    storeDefaultCasesMenuOption.load();
                 });
 
                 comboDefaultCasesMenuOption.store.on("load", function (store) {
                     if (comboDefaultMainMenuOption.getValue() == 'PM_CASES') {
                         comboDefaultCasesMenuOption.enable();
                     }
+
                     comboDefaultCasesMenuOption.setValue(data.user.PREF_DEFAULT_CASES_MENUSELECTED);
                 });
             } else {
@@ -1325,6 +1303,31 @@ function loadUserData()
             }
 
             previousUsername = Ext.getCmp("USR_USERNAME").getValue();
+
+            storeCountry.load();
+
+            storeRegion.load({
+                params: {
+                    IC_UID : data.user.USR_COUNTRY
+                }
+            });
+
+            storeLocation.load({
+                params: {
+                    IC_UID : data.user.USR_COUNTRY,
+                    IS_UID : data.user.USR_CITY
+                }
+            });
+
+            storeReplacedBy.load();
+
+            storeCalendar.load();
+
+            storeRole.load();
+
+            storeDefaultMainMenuOption.load();
+
+            //storeDefaultCasesMenuOption.load();
         },
         failure: function (r, o) {
             //viewport.getEl().unmask();