0024015: Standard View option of the Save View feature does not work well

diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
@@ -992,6 +992,8 @@
       }
     }
 
+    state.filterClause = this.filterClause;
+
     // set summary information, can not be stored in the field state
     // because smartclient does not provide a nice override point
     // when setting the fieldstate back to also set the summary function
@@ -1074,6 +1076,8 @@
       if (this.view.messageBar) {
         this.view.messageBar.hide();
       }
+    } else if (localState.filterClause) {
+      this.filterClause = localState.filterClause;
     }
 
     // and no additional filter clauses passed in
diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js
@@ -139,13 +139,14 @@
         valueMap = {},
         flds = [],
         standardWindow = this.standardWindow,
-        length;
+        length, originalView = standardWindow.getClass().originalView;
 
     if (views) {
       length = views.length;
       for (i = 0; i < length; i++) {
         valueMap[views[i].personalizationId] = views[i].viewDefinition.name;
       }
+      valueMap[originalView.personalizationId] = originalView.viewDefinition.name;
     }
 
     flds[0] = isc.addProperties({
@@ -155,7 +156,6 @@
       editorType: 'select',
       addUnknownValues: false,
       required: true,
-      allowEmptyValue: true,
       changed: function () {
         // enable the save button when there is a change
         this.form.saveButton.setDisabled(false);
@@ -166,8 +166,10 @@
 
     // set the value
     value = OB.PropertyStore.get('OBUIAPP_DefaultSavedView', this.standardWindow.windowId);
-    if (value) {
+    if (value && flds[0].valueMap[value]) {
       flds[0].value = value;
+    } else {
+      flds[0].value = 'dummyId';
     }
 
     return flds;