0019130: Refresh button has incorrect side effect of clearing column filters / current saved view

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
@@ -1021,7 +1021,7 @@
       criteria.criteria = [];
     }
     
-    if (this.targetRecordId) {
+    if (!this.notRemoveFilter && this.targetRecordId) {
       // do not filter on anything with a targetrecord
       criteria = {
         operator: 'and', 
@@ -1030,11 +1030,6 @@
         
       // add a dummy criteria to force a fetch
       criteria.criteria.push(isc.OBRestDataSource.getDummyCriterion());
-      
-      if (!this.notRemoveFilter) {
-        // remove the filter clause we don't want to use it anymore
-        this.filterClause = null;
-      }
     } else if (this.forceRefresh) {
       // add a dummy criteria to force a fetch
       criteria.criteria.push(isc.OBRestDataSource.getDummyCriterion());