Fix #6628 - searching on notification history

[Pman.Admin] / Pman.Tab.AdminCompanies.bjs

diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs
index c13d5c5..8b1cca5 100644 (file)
--- a/Pman.Tab.AdminCompanies.bjs
+++ b/Pman.Tab.AdminCompanies.bjs
@@ -25,8 +25,8 @@
  "items" : [
   {
    "region" : "center",
-   "title" : "Companies",
    "xtype" : "NestedLayoutPanel",
+   "title" : "Companies",
    "$ xns" : "Roo",
    "items" : [
     {
@@ -89,8 +89,8 @@
               "load" : "function (This, o, arg)\n{\n \n}"
              },
              "$ url" : "baseURL + '/Roo/core_company'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -186,7 +186,7 @@
             },
             {
              "listeners" : {
-              "|click" : "function()\n{\n    Pman.genericDelete(_this, 'Companies'); \n}\n        "
+              "|click" : "function()\n{\n    Pman.genericDelete(_this, 'core_company'); \n}\n        "
              },
              "text" : "Delete",
              "xtype" : "Button",
@@ -204,7 +204,7 @@
            "$ renderer" : "function (v,x ,r) {\n    //return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v);\n    return v;\n}",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
-           "dataIndex" : "comptype"
+           "dataIndex" : "comptype_id_display_name"
           },
           {
            "xtype" : "ColumnModel",
@@ -228,8 +228,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 100,
            "header" : "Tel",
+           "width" : 100,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -237,8 +237,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 100,
            "header" : "Fax",
+           "width" : 100,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -266,8 +266,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "Remarks",
            "width" : 200,
+           "header" : "Remarks",
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",