Pman.Tab.XtupleSalesOrder.bjs

Pman.Tab.XtupleSalesOrder.js

diff --git a/Pman.Tab.XtupleSalesOrder.bjs b/Pman.Tab.XtupleSalesOrder.bjs
index bc9d71a..daa4229 100644 (file)
--- a/Pman.Tab.XtupleSalesOrder.bjs
+++ b/Pman.Tab.XtupleSalesOrder.bjs
@@ -142,7 +142,7 @@
                                                                 },
                                                                 {
                                                                     "listeners": {
-                                                                        "click": "function (_self, e)\n{\n    Pman.Dialog.XtupleUploadBalances.show( {} , function(res) {\n        Pman.Dialog.Image.show({\n            _url : baseURL + '/Xtuple/Import/HSBC?' + Roo.urlEncode(res)\n        }, function(data) {\n             _this.wgrid.ds.load({});\n        });\n    }); \n                                                           \n   Pman.Dialog.Image.show(\n       {\n            _url : baseURL+'/Xtuple/Import/HSBC',\n            timeout : 90000\n        \n       },\n       function (data) {\n            Roo.MessageBox.alert(\"Notice\", data); \n            _this.grid.footer.onClick('first');\n\n       }\n   );\n}"
+                                                                        "click": "function (_self, e)\n{\n    Pman.Dialog.XtupleUploadBalances.show( {} , function(res) {\n        Pman.Dialog.Image.show({\n            timeout : 90000,\n            _url : baseURL + '/Xtuple/Import/HSBC?' + Roo.urlEncode(res)\n        }, function(data) {\n            _this.grid.footer.onClick('first');\n        });\n    }); \n}"
                                                                     },
                                                                     "text": "Import HSBC csv file",
                                                                     "xtype": "Item",

diff --git a/Pman.Tab.XtupleSalesOrder.js b/Pman.Tab.XtupleSalesOrder.js
index d8fb076..4e0edd2 100644 (file)
--- a/Pman.Tab.XtupleSalesOrder.js
+++ b/Pman.Tab.XtupleSalesOrder.js
@@ -232,24 +232,12 @@ Pman.Tab.XtupleSalesOrder = new Roo.XComponent({
                                                         {
                                                             Pman.Dialog.XtupleUploadBalances.show( {} , function(res) {
                                                                 Pman.Dialog.Image.show({
+                                                                    timeout : 90000,
                                                                     _url : baseURL + '/Xtuple/Import/HSBC?' + Roo.urlEncode(res)
                                                                 }, function(data) {
-                                                                     _this.wgrid.ds.load({});
+                                                                    _this.grid.footer.onClick('first');
                                                                 });
                                                             }); 
-                                                                                                                   
-                                                           Pman.Dialog.Image.show(
-                                                               {
-                                                                    _url : baseURL+'/Xtuple/Import/HSBC',
-                                                                    timeout : 90000
-                                                                
-                                                               },
-                                                               function (data) {
-                                                                    Roo.MessageBox.alert("Notice", data); 
-                                                                    _this.grid.footer.onClick('first');
-                                                        
-                                                               }
-                                                           );
                                                         }
                                                     },
                                                     text : "Import HSBC csv file"