Fix #7123 - getting abra ready to test

[Pman.Xtuple] / Pman.Tab.XtupleTransfer.js

diff --git a/Pman.Tab.XtupleTransfer.js b/Pman.Tab.XtupleTransfer.js
index 019a9dc..8f1a02e 100644 (file)
--- a/Pman.Tab.XtupleTransfer.js
+++ b/Pman.Tab.XtupleTransfer.js
@@ -598,6 +598,7 @@ Pman.Tab.XtupleTransfer = new Roo.XComponent({
                                             url : baseURL + '/Roo/invhist_transfer',
                                             method : 'POST',
                                             mask : "Voiding",
+                                            timeout : 90000,
                                             params : {
                                                 invhist_transfer_id : s.data.invhist_transfer_id,
                                                 _void : 1
@@ -750,15 +751,26 @@ Pman.Tab.XtupleTransfer = new Roo.XComponent({
                         width : 100,
                         renderer : function(v,x,r) 
                         {
-                            if(r.data.invhist_transfer_posted){
-                                var diff = v + r.data.moved_qty;
-                                var color = 'black';
-                                if(diff != 0){
-                                    color = 'red';
-                                }
-                                return String.format('{0}<span color="{1}"> ({2}) </span>', v, color, r.data.moved_qty * -1);         
+                            if(
+                                r.data.cust_to_internalcompany.length 
+                                || 
+                                (r.data.invhist_transfer_void && r.data.moved_qty == 0)
+                                ||
+                                (!r.data.invhist_transfer_void && !r.data.invhist_transfer_posted)
+                                ){
+                                return String.format('{0}', v); 
+                            }
+                            
+                            var diff = v * 1 - r.data.moved_qty * 1;
+                            var flag =   ''
+                            
+                            if(diff != 0){
+                                flag =  '<span style="color:red"> ({1}) </span>'
                             }
-                            return String.format('{0}', v); 
+                        
+                            return String.format('{0}' + flag, v, r.data.moved_qty);         
+                        
+                            
                         }
                     },
                     {