Pman.Tab.XtupleStockHistory.bjs

Pman.Tab.XtupleStockHistory.js

diff --git a/Pman.Tab.XtupleStockHistory.bjs b/Pman.Tab.XtupleStockHistory.bjs
index 808794f..bf48f68 100644 (file)
--- a/Pman.Tab.XtupleStockHistory.bjs
+++ b/Pman.Tab.XtupleStockHistory.bjs
@@ -553,7 +553,7 @@
                             "header": "Fifo Landed Unitcost",
                             "width": 75,
                             "xtype": "ColumnModel",
-                            "|renderer": "function(v,x,r) { \n    \n    var cu = ((r.data.invfifo_cost_after*1 - r.data.invfifo_cost_before*1) / Math.abs(r.data.invdetail_qty)).toFixed(2);\n    var lu = (v*1).toFixed(2) ;\n    if (cu != lu) {\n        return '<span style=\"color:red\">' + lu +'/' +cu + '</span>';\n    }\n    return  lu;\n }",
+                            "|renderer": "function(v,x,r) { \n    \n    var cu = ((r.data.invfifo_cost_after*1 - r.data.invfifo_cost_before*1) / Math.abs(r.data.invdetail_qty)).toFixed(2);\n    var lu = (v*1).toFixed(2) ;\n    if (cu != lu) {\n        \n        if (r.data.invfifo_void > 0) { \n            return   '<s><span style=\"color:red\">' + + lu +'/' +cu + '</span></s>';\n        } \n        \n        return '<span style=\"color:red\">' + lu +'/' +cu + '</span>';\n    }\n    if (r.data.invfifo_void > 0) { \n        return   '<s>' + lu + '</s>';\n    } \n        \n    return  lu;\n }",
                             "|xns": "Roo.grid"
                         }
                     ]

diff --git a/Pman.Tab.XtupleStockHistory.js b/Pman.Tab.XtupleStockHistory.js
index a93e9fd..bbe8d21 100644 (file)
--- a/Pman.Tab.XtupleStockHistory.js
+++ b/Pman.Tab.XtupleStockHistory.js
@@ -1120,8 +1120,17 @@ Pman.Tab.XtupleStockHistory = new Roo.XComponent({
                             var cu = ((r.data.invfifo_cost_after*1 - r.data.invfifo_cost_before*1) / Math.abs(r.data.invdetail_qty)).toFixed(2);
                             var lu = (v*1).toFixed(2) ;
                             if (cu != lu) {
+                                
+                                if (r.data.invfifo_void > 0) { 
+                                    return   '<s><span style="color:red">' + + lu +'/' +cu + '</span></s>';
+                                } 
+                                
                                 return '<span style="color:red">' + lu +'/' +cu + '</span>';
                             }
+                            if (r.data.invfifo_void > 0) { 
+                                return   '<s>' + lu + '</s>';
+                            } 
+                                
                             return  lu;
                          }
                     }