From c032be2c9504a629c9d03a3bdc44c93ebee5dcd5 Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Fri, 4 Nov 2016 13:11:03 +0800
Subject: [PATCH] Pman.Dialog.AdminCompanyMerge.bjs
 Pman.Dialog.AdminCompanyMerge.js

---
 Pman.Dialog.AdminCompanyMerge.bjs | 2 +-
 Pman.Dialog.AdminCompanyMerge.js  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index a7ed964..214c849 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -16,7 +16,7 @@
  "items" : [
   {
    "listeners" : {
-    "show" : "function (_self)\n{\n    if (_this.isBuilder) {\n        _this.data = { id : 2, comptype : 'SUPPLIER' }\n    }\n}"
+    "show" : "function (_self)\n{\n    \n}"
    },
    "modal" : true,
    "collapsible" : false,
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index 1bf0ade..717bde8 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -50,9 +50,7 @@ Pman.Dialog.AdminCompanyMerge = {
     listeners : {
      show : function (_self)
       {
-          if (_this.isBuilder) {
-              _this.data = { id : 2, comptype : 'SUPPLIER' }
-          }
+          
       }
     },
     xns : Roo,
-- 
2.39.2