merge
authorDavid Baz Fayos <david.baz@openbravo.com>
Sun, 13 May 2012 23:35:37 +0200
changeset 16505 fae3a9d99ec8
parent 16504 e08294a7f372 (current diff)
parent 16502 8f6f2842e1f0 (diff)
child 16506 408a83fb81ae
merge
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Sun May 13 23:34:44 2012 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Sun May 13 23:35:37 2012 +0200
@@ -2054,33 +2054,17 @@
       this.view.standardWindow.doActionAfterAutoSave(actionObject, true);
       return;
     }
-    if (ficCallDone) {
-      // get new value as the row can have changed
-      this.Super('cellEditEnd', [editCompletionEvent, this.getEditValue(rowNum, colNum)]);
-      return;
-    } else {
-      // only needed for non picklist fields
-      // as picklist fields will always have picked a value
-      // note that focusItem updatevalue for picklist can result in extra datasource requests
-      if (focusItem && !focusItem.hasPickList) {
-        focusItem.blur(focusItem.form, focusItem);
-        if (editForm.inFicCall) {
-          // use editValues object as the edit form will be re-used for a next row
-          var editValues = this.getEditValues(rowNum);
-          editValues.actionAfterFicReturn = {
-            target: this,
-            method: this.cellEditEnd,
-            parameters: [editCompletionEvent, newValue, true, autoSaveDone]
-          };
-          return;
-        }
-      }
-    }
     if (newValue) {
       this.Super('cellEditEnd', [editCompletionEvent, newValue]);
     } else {
       this.Super('cellEditEnd', [editCompletionEvent]);
     }
+    // only needed for non picklist fields
+    // as picklist fields will always have picked a value
+    // note that focusItem updatevalue for picklist can result in extra datasource requests
+    if (focusItem && !focusItem.hasPickList) {
+      focusItem.blur(focusItem.form, focusItem);
+    }
   },
 
   // overridden to set the enterkeyaction to nextrowstart in cases the current row
@@ -2164,7 +2148,7 @@
 
     if (ficCallDone) {
       // reset the new values as this can have changed because of a fic call
-      newValues = this.getEditValues(editValuesID);
+      newValues = this.getEditValues(rowNum);
     } else {
       var editForm = this.getEditForm(),
           focusItem = editForm.getFocusItem();
@@ -2172,7 +2156,7 @@
         focusItem.blur(focusItem.form, focusItem);
         if (editForm.inFicCall) {
           // use editValues object as the edit form will be re-used for a next row
-          var editValues = this.getEditValues(editValuesID);
+          var editValues = this.getEditValues(rowNum);
           editValues.actionAfterFicReturn = {
             target: this,
             method: this.saveEditedValues,