Pman.Dialog.XtupleTransfer.bjs

Pman.Dialog.XtupleTransfer.js

diff --git a/Pman.Dialog.XtupleTransfer.bjs b/Pman.Dialog.XtupleTransfer.bjs
index 1ef8157..0412e23 100644 (file)
--- a/Pman.Dialog.XtupleTransfer.bjs
+++ b/Pman.Dialog.XtupleTransfer.bjs
@@ -922,7 +922,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "|click": "function()\n{\n    var id = _this.form.findField('invhist_transfer_id').getValue();\n\n    if(id * 1 < 1){\n        return;\n    }\n    \n    var ar = [];\n    \n    _this.tgrid.ds.each(function (r) {\n        if (_this.data.invhist_transfer_void && r.data.transfered_qty * 1 == 0 && r.data.expected_qty * 1 == 0) {\n            return;\n        }\n        if(!_this.data.invhist_transfer_void && r.data.transfered_qty * 1 - r.data.expected_qty * 1 == 0){\n            return;\n        }\n        \n        ar.push({\n            id : r.data.invhist_transfer_item_id\n        })\n   });\n   \n   if(!ar.length){\n        Roo.MessageBox.alert(\"Notice\", \"Nothing Wrong!\");\n        return;\n   }\n   \n    new Pman.Request({\n        url : baseURL + '/Roo/invhist_transfer',\n        method : 'POST',\n        mask: 'Fixing',\n        timeout : 1200000, //20 minutes...! - big xfer should be 10mins.\n        params : {\n            invhist_transfer_id : id,\n            _fix : Roo.encode(ar)\n        },\n        success : function () \n        {\n            _this.tgrid.footer.onClick('refresh');\n        }\n    });\n    \n    \n    \n}\n"
+                                                "|click": "function()\n{\n    var id = _this.form.findField('invhist_transfer_id').getValue();\n\n    if(id * 1 < 1){\n        return;\n    }\n    \n    var err = false;\n    \n    _this.tgrid.ds.each(function (r) {\n        if (_this.data.invhist_transfer_void && r.data.transfered_qty * 1 == 0 && r.data.expected_qty * 1 == 0) {\n            return;\n        }\n        if(!_this.data.invhist_transfer_void && r.data.transfered_qty * 1 - r.data.expected_qty * 1 == 0){\n            return;\n        }\n        \n        err = true;\n   });\n   \n   if(!err){\n        Roo.MessageBox.alert(\"Notice\", \"Nothing Wrong!\");\n        return;\n   }\n   \n    new Pman.Request({\n        url : baseURL + '/Roo/invhist_transfer',\n        method : 'POST',\n        mask: 'Fixing',\n        timeout : 1200000, //20 minutes...! - big xfer should be 10mins.\n        params : {\n            invhist_transfer_id : id,\n            _fix : 1\n        },\n        success : function () \n        {\n            _this.tgrid.footer.onClick('refresh');\n        }\n    });\n    \n    \n    \n}\n"
                                             },
                                             "cls": "x-btn-text-icon",
                                             "text": "Fix Transfer",

diff --git a/Pman.Dialog.XtupleTransfer.js b/Pman.Dialog.XtupleTransfer.js
index cded19b..40ea19e 100644 (file)
--- a/Pman.Dialog.XtupleTransfer.js
+++ b/Pman.Dialog.XtupleTransfer.js
@@ -1593,7 +1593,7 @@ Pman.Dialog.XtupleTransfer = {
                                                 return;
                                             }
                                             
-                                            var ar = [];
+                                            var err = false;
                                             
                                             _this.tgrid.ds.each(function (r) {
                                                 if (_this.data.invhist_transfer_void && r.data.transfered_qty * 1 == 0 && r.data.expected_qty * 1 == 0) {
@@ -1603,12 +1603,10 @@ Pman.Dialog.XtupleTransfer = {
                                                     return;
                                                 }
                                                 
-                                                ar.push({
-                                                    id : r.data.invhist_transfer_item_id
-                                                })
+                                                err = true;
                                            });
                                            
-                                           if(!ar.length){
+                                           if(!err){
                                                 Roo.MessageBox.alert("Notice", "Nothing Wrong!");
                                                 return;
                                            }
@@ -1620,7 +1618,7 @@ Pman.Dialog.XtupleTransfer = {
                                                 timeout : 1200000, //20 minutes...! - big xfer should be 10mins.
                                                 params : {
                                                     invhist_transfer_id : id,
-                                                    _fix : Roo.encode(ar)
+                                                    _fix : 1
                                                 },
                                                 success : function () 
                                                 {