Pman.Tab.XtupleSalesOrder.bjs

Pman.Tab.XtupleSalesOrder.js

diff --git a/Pman.Tab.XtupleSalesOrder.bjs b/Pman.Tab.XtupleSalesOrder.bjs
index cf6847d..8a56090 100644 (file)
--- a/Pman.Tab.XtupleSalesOrder.bjs
+++ b/Pman.Tab.XtupleSalesOrder.bjs
@@ -330,7 +330,7 @@
                                             "sortable": true,
                                             "width": 100,
                                             "xtype": "ColumnModel",
-                                            "|renderer": "function(v,x,r) {\n\n      \n      // we want to show more detail about status..\n      // like payment status / delivery etc...\n      \n      // I = invoiced\n      // R = Reserved\n      // S = shipped (or partial shipped)\n      // P = paid (or partial paid)\n      // online payment failed? >> on terms?\n      // \n      var tags = {\n        invoiced : '<span class=\"dragon-so-complete\" qtip=\"Invoiced\">I</span>',\n        invoiced_not : '<span class=\"dragon-so-complete-not\"  qtip=\"Not Invoiced\">I</span>',\n        stock_not : '<span class=\"dragon-so-complete-not\" qtip=\"Stock not reserved or shipped\">S</span>',        \n        stock_reserved : '<span class=\"dragon-so-complete-not\" qtip=\"Stock Reserved / Not shipped\">R</span>',\n        stock_shipped : '<span class=\"dragon-so-complete\" qtip=\"Shipped\">S</span>',\n        paid : '<span class=\"dragon-so-complete\" qtip=\"Paid\">P</span>',\n        paid_not : '<span class=\"dragon-so-complete-not\" qtip=\"Not Paid\">P</span>'\n    };        \n     \n     // invoiced\n     var tg = ' ';\n     tg += (r.data.cohead_qtyuninvoiced > 0) ? tags.invoiced_not : tags.invoiced;\n     // ?? partially invoiced??\n     \n      // stock status...\n     tg += (r.data.cohead_qtyunshipped > 0) ? tags.stock_not : tags.stock_shipped;\n     \n     if (r.data.cohead_qtyuninvoiced*1 < 1) {\n          tg += (r.data.aropen_unpaid > 0) ? tags.paid_not : tags.paid;\n      }\n     \n     \n     \n    // payment status??\n\n      if (r.data.cohead_status == 'C') {\n          return String.format('<i qtip=\"closed\">{0}</i>', v) + tg \n      }\n      if (r.data.cohead_status == 'X') {\n          return String.format('<s qtip=\"void\">{0}</s>', v) + tg ; \n      }\n      return String.format('{0}', v) + tg ; \n }",
+                                            "|renderer": "function(v,x,r) {\n\n      \n      // we want to show more detail about status..\n      // like payment status / delivery etc...\n      \n      // I = invoiced\n      // R = Reserved\n      // S = shipped (or partial shipped)\n      // P = paid (or partial paid)\n      // online payment failed? >> on terms?\n      // \n      var tags = {\n        invoiced : '<span class=\"dragon-so-complete\" qtip=\"Invoiced\">I</span>',\n        invoiced_not : '<span class=\"dragon-so-complete-not\"  qtip=\"Not Invoiced\">I</span>',\n        stock_not : '<span class=\"dragon-so-complete-not\" qtip=\"Stock not reserved or shipped\">S</span>',        \n        stock_reserved : '<span class=\"dragon-so-complete-not\" qtip=\"Stock Reserved / Not shipped\">R</span>',\n        stock_shipped : '<span class=\"dragon-so-complete\" qtip=\"Shipped\">S</span>',\n        paid : '<span class=\"dragon-so-complete\" qtip=\"Paid\">P</span>',\n        paid_not : '<span class=\"dragon-so-complete-not\" qtip=\"Not Paid\">P</span>'\n    };        \n     \n     // invoiced\n     var tg = ' ';\n     tg += (r.data.cohead_qtyuninvoiced > 0) ? tags.invoiced_not : tags.invoiced;\n     // ?? partially invoiced??\n     \n      // stock status...\n     tg += (r.data.cohead_qtyunshipped > 0) ? tags.stock_not : tags.stock_shipped;\n    \n     \n     \n    // payment status??\n\n      if (r.data.cohead_status == 'C') {\n          return String.format('<i qtip=\"closed\">{0}</i>', v) + tg \n      }\n      if (r.data.cohead_status == 'X') {\n          return String.format('<s qtip=\"void\">{0}</s>', v) + tg ; \n      }\n      return String.format('{0}', v) + tg ; \n }",
                                             "|xns": "Roo.grid"
                                         },
                                         {

diff --git a/Pman.Tab.XtupleSalesOrder.js b/Pman.Tab.XtupleSalesOrder.js
index c334ab5..660b837 100644 (file)
--- a/Pman.Tab.XtupleSalesOrder.js
+++ b/Pman.Tab.XtupleSalesOrder.js
@@ -748,11 +748,7 @@ Pman.Tab.XtupleSalesOrder = new Roo.XComponent({
                                          
                                           // stock status...
                                          tg += (r.data.cohead_qtyunshipped > 0) ? tags.stock_not : tags.stock_shipped;
-                                         
-                                         if (r.data.cohead_qtyuninvoiced*1 < 1) {
-                                              tg += (r.data.aropen_unpaid > 0) ? tags.paid_not : tags.paid;
-                                          }
-                                         
+                                        
                                          
                                          
                                         // payment status??