From: Alan Knowles <alan@roojs.com>
Date: Fri, 22 Jan 2016 05:27:19 +0000 (+0800)
Subject: Pman.Dialog.CoreEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=459179d6d6b20c9b839758fa0b8943c7a4f7825e

Pman.Dialog.CoreEnumMerge.bjs
Pman.Dialog.CoreEnumMerge.js
---

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 6a351d5a..0e172433 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -6,9 +6,8 @@
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
-  "99b344c8ae43e3e7213862b8f35c4e51" : "Select Company",
-  "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
   "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
+  "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
   "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
@@ -60,7 +59,7 @@
          "selectOnFocus" : true,
          "pageSize" : 20,
          "displayField" : "name",
-         "emptyText" : "Select Company",
+         "emptyText" : "Select Item to Merge With",
          "hiddenName" : "_merge_with_id",
          "minChars" : 2,
          "valueField" : "id",
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 51e82aa5..a39210ba 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,9 +7,8 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
-  '99b344c8ae43e3e7213862b8f35c4e51' :"Select Company",
-  '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
+  '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
@@ -147,7 +146,7 @@ Pman.Dialog.CoreEnumMerge = {
           allowBlank : false,
           alwaysQuery : true,
           displayField : 'name',
-          emptyText : _this._strings['99b344c8ae43e3e7213862b8f35c4e51'] /* Select Company */,
+          emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
           forceSelection : true,
           hiddenName : '_merge_with_id',