Pman.Dialog.CoreCompanies.bjs

[Pman.Core] / Pman.Dialog.CoreCompanies.bjs

diff --git a/Pman.Dialog.CoreCompanies.bjs b/Pman.Dialog.CoreCompanies.bjs
index 1d19501..9ed9e11 100644 (file)
--- a/Pman.Dialog.CoreCompanies.bjs
+++ b/Pman.Dialog.CoreCompanies.bjs
@@ -53,7 +53,7 @@
                                     "|xns": "Roo.form",
                                     "items": [
                                         {
-                                            "allowBlank": false,
+                                            "allowBlank": true,
                                             "fieldLabel": "Company ID (for filing Ref.)",
                                             "name": "code",
                                             "qtip": "Enter code",
@@ -61,56 +61,29 @@
                                             "xtype": "TextField",
                                             "|xns": "Roo.form"
                                         },
-                                        {
-                                            "allowBlank": false,
-                                            "displayField": "desc",
-                                            "editable": false,
-                                            "emptyText": "Select Type",
-                                            "fieldLabel": "Type",
-                                            "hiddenName": "comptype",
-                                            "listWidth": 250,
-                                            "name": "comptype_name",
-                                            "qtip": "Select Company type",
-                                            "selectOnFocus": true,
-                                            "triggerAction": "all",
-                                            "typeAhead": false,
-                                            "valueField": "val",
-                                            "width": 200,
-                                            "xtype": "ComboBox",
-                                            "|xns": "Roo.form",
-                                            "items": [
-                                                {
-                                                    "*prop": "store",
-                                                    "data": "[ 'CONSULTANT', \"Consultant\" ],[ 'CLIENT'    ,  \"Client\" ],[ 'CONTRACTOR' , \"Contractor\" ]",
-                                                    "fields": "['val', 'desc']",
-                                                    "xtype": "SimpleStore",
-                                                    "|xns": "Roo.data"
-                                                }
-                                            ]
-                                        },
                                         {
                                             "listeners": {
-                                                "render": "function (_self)\n{\n    _this.etypeCombo = _self;\n}",
-                                                "select": "function (combo, record, index)\n{\n    _this.grid.footer.onClick('first');\n}"
+                                                "render": "function (_self)\n{\n    _this.etypeCombo = _self;\n}"
                                             },
                                             "alwaysQuery": true,
-                                            "displayField": "name",
-                                            "editable": "false",
-                                            "emptyText": "Select pulldown",
+                                            "displayField": "comptype_name",
+                                            "emptyText": "Select Type",
                                             "fieldLabel": "Type",
                                             "forceSelection": true,
+                                            "hiddenName": "comptype",
                                             "listWidth": 250,
                                             "loadingText": "Searching...",
                                             "minChars": 2,
+                                            "name": "comptype_name",
                                             "pageSize": 20,
                                             "qtip": "Select type",
                                             "queryParam": "query[name]",
                                             "selectOnFocus": true,
-                                            "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
+                                            "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{comptype_name}</b> </div>",
                                             "triggerAction": "all",
                                             "typeAhead": false,
-                                            "valueField": "name",
-                                            "width": 300,
+                                            "valueField": "val",
+                                            "width": 200,
                                             "xtype": "ComboBox",
                                             "|xns": "Roo.form",
                                             "items": [