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

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

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index 1942246..ef8f8f4 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -71,7 +71,7 @@
          "name" : "_merge_id_name",
          "qtip" : "Select Item to Merge With",
          "queryParam" : "search[name]",
-         "tpl" : "<div class=\"x-grid-cell-text x-btn button\">{code} - <b>{name}</b> {name}</div>",
+         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b></div>",
          "loadingText" : "Searching...",
          "items" : [
           {
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index db73919..a6f19b8 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -153,7 +153,7 @@ Pman.Dialog.AdminCompanyMerge = {
           qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           queryParam : 'search[name]',
           selectOnFocus : true,
-          tpl : '<div class=\"x-grid-cell-text x-btn button\">{code} - <b>{name}</b> {name}</div>',
+          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b></div>',
           triggerAction : 'all',
           typeAhead : true,
           valueField : 'id',
-- 
2.39.2