Pman.Dialog.CoreEnumMerge.bjs

[Pman.Core] / Pman.Dialog.CoreEnumMerge.js

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index b840dc5..6676a23 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -8,11 +8,11 @@ Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
   '99b344c8ae43e3e7213862b8f35c4e51' :"Select Company",
+  '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
-  'e26f3a67ad6487fd02ffcab189214302' :"Merge Supplier",
   '9675747b5ab12d05f18518761e68a533' :"Select Companies"
  },
 
@@ -45,7 +45,7 @@ Pman.Dialog.CoreEnumMerge = {
     height : 120,
     modal : true,
     resizable : false,
-    title : _this._strings['e26f3a67ad6487fd02ffcab189214302'] /* Merge Supplier */,
+    title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
     width : 400,
     xns : Roo,
     '|xns' : 'Roo',
@@ -101,7 +101,7 @@ Pman.Dialog.CoreEnumMerge = {
        {
         method : 'POST',
         style : 'margin: 10px;',
-        url : baseURL + '/Shipping/CompanyMerge.php',
+        url : baseURL + '/Roo/Core_enum.php',
         xns : Roo.form,
         '|xns' : 'Roo.form',
         xtype : 'Form',
@@ -150,7 +150,7 @@ Pman.Dialog.CoreEnumMerge = {
           emptyText : _this._strings['99b344c8ae43e3e7213862b8f35c4e51'] /* Select Company */,
           fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
           forceSelection : true,
-          hiddenName : 'merge_id',
+          hiddenName : '_merge_with_id',
           listWidth : 400,
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,