From ce4f36e1bde3d11146b1ef76bbddf048600d69c3 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Mon, 27 Mar 2017 09:59:15 -0400
Subject: [PATCH 1/3] HOR-2909

---
 workflow/engine/classes/class.consolidatedCases.php         | 2 +-
 .../engine/content/translations/english/processmaker.en.po  | 6 ++++++
 workflow/engine/data/mysql/insert.sql                       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.consolidatedCases.php b/workflow/engine/classes/class.consolidatedCases.php
index 3e5d9ae39..9f870f9ea 100644
--- a/workflow/engine/classes/class.consolidatedCases.php
+++ b/workflow/engine/classes/class.consolidatedCases.php
@@ -24,7 +24,7 @@ class ConsolidatedCases
             return true;
         }
         if ($this->existTable && $Status) {
-            throw (new \Exception(\G::LoadTranslation("ID_TABLE_ALREADY_EXISTS")));
+            throw (new \Exception(\G::LoadTranslation("ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS")));
         }
 
         if ($RepTabUid != '') {
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 592a61be5..61d5e22fe 100644
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -1465,6 +1465,12 @@ msgstr "Please enter the required fields"
 msgid "Table already exists"
 msgstr "Table already exists"
 
+# TRANSLATION
+# LABEL/ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS
+#: LABEL/ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS
+msgid "The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration."
+msgstr "The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration."
+
 # TRANSLATION
 # LABEL/ID_LANGUAGES
 #: LABEL/ID_LANGUAGES
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index 39c9117d5..57478903b 100644
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -1683,6 +1683,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 
 ( 'LABEL','ID_PLEASE_ENTER_REQUIRED_FIELDS','en','Please enter the required fields','2014-01-15') ,
 ( 'LABEL','ID_TABLE_ALREADY_EXISTS','en','Table already exists','2014-01-15') ,
+( 'LABEL','ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS','en','The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration.','2017-03-27') ,
 ( 'LABEL','ID_LANGUAGES','en','Language','2014-01-15') ,
 ( 'LABEL','ID_EXPORT','en','Export','2014-01-15') ,
 ( 'LABEL','ID_MSG_CONFIRM_REMOVE_LANGUAGE','en','Are you sure you want to remove this language?','2014-01-15') ,

From 9d62037423c1fba9dca0948dec1ddff242406508 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 19 May 2017 09:03:03 -0400
Subject: [PATCH 2/3] HOR-2909 improvement

---
 .../xmlform/tasks/tasks_Consolidated.xml      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/workflow/engine/xmlform/tasks/tasks_Consolidated.xml b/workflow/engine/xmlform/tasks/tasks_Consolidated.xml
index a86daff32..55c9543a3 100644
--- a/workflow/engine/xmlform/tasks/tasks_Consolidated.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Consolidated.xml
@@ -8,9 +8,9 @@
 <TABLE_NAME_DEFAULT type="hidden" />
 <IFORM type="hidden" />
 
-<CON_STATUS type="checkbox" value="ACTIVE" falsevalue="INACTIVE">
-  <en><![CDATA[Enable consolidate for this task.]]></en>
-</CON_STATUS>
+  <CON_STATUS type="checkbox" value="ACTIVE" falsevalue="INACTIVE">
+    <en><![CDATA[Enable consolidate for this task.]]></en>
+  </CON_STATUS>
 
 <DYN_UID type="dropdown">
   <![CDATA[
@@ -31,16 +31,16 @@
     <option name="">- Select a DynaForm template -</option>
   </en>
 </DYN_UID>
-<TABLE_NAME type="text" maxlength="60" validate="Login" size="40" mode="edit" required="1" mask="">
-  <en><![CDATA[Table Name]]></en>
-</TABLE_NAME>
-<TITLE type="text" maxlength="60" validate="Any" size="40" mode="edit">
-  <en><![CDATA[Title]]></en>
-</TITLE>
+  <TABLE_NAME type="text" maxlength="60" validate="Login" size="40" mode="edit" required="1" mask="">
+    <en><![CDATA[Table Name]]></en>
+  </TABLE_NAME>
+  <TITLE type="text" maxlength="60" validate="Any" size="40" mode="edit">
+    <en><![CDATA[Title]]></en>
+  </TITLE>
 
 <APPLY type="button" onClick="conSaveProperties(0)" >
-  <en><![CDATA[Apply]]></en>
-</APPLY>
+    <en><![CDATA[Apply]]></en>
+  </APPLY>
 
 <JS type="javascript">
   <![CDATA[
@@ -69,7 +69,7 @@
             case 1:
                 tableName.failed();
 
-                if(confirm("The table name already exists\n\nDo you want to overwrite the table?")) {
+                if(confirm("@G::LoadTranslation(ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS)")) {
                     conSaveProperties(1);
                 }
                 break;
@@ -114,6 +114,5 @@
       hideRow('TITLE');
     }
   };
-  ]]>
-</JS>
-</dynaForm>
\ No newline at end of file
+  ]]></JS>
+</dynaForm>

From f7d3af21d0553838629dc9b9ee48b8d406009e75 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Fri, 19 May 2017 09:06:35 -0400
Subject: [PATCH 3/3] HOR-2909 improvement

---
 .../xmlform/tasks/tasks_Consolidated.xml      | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/workflow/engine/xmlform/tasks/tasks_Consolidated.xml b/workflow/engine/xmlform/tasks/tasks_Consolidated.xml
index 55c9543a3..86bb87b04 100644
--- a/workflow/engine/xmlform/tasks/tasks_Consolidated.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Consolidated.xml
@@ -8,9 +8,9 @@
 <TABLE_NAME_DEFAULT type="hidden" />
 <IFORM type="hidden" />
 
-  <CON_STATUS type="checkbox" value="ACTIVE" falsevalue="INACTIVE">
-    <en><![CDATA[Enable consolidate for this task.]]></en>
-  </CON_STATUS>
+<CON_STATUS type="checkbox" value="ACTIVE" falsevalue="INACTIVE">
+  <en><![CDATA[Enable consolidate for this task.]]></en>
+</CON_STATUS>
 
 <DYN_UID type="dropdown">
   <![CDATA[
@@ -31,16 +31,16 @@
     <option name="">- Select a DynaForm template -</option>
   </en>
 </DYN_UID>
-  <TABLE_NAME type="text" maxlength="60" validate="Login" size="40" mode="edit" required="1" mask="">
-    <en><![CDATA[Table Name]]></en>
-  </TABLE_NAME>
-  <TITLE type="text" maxlength="60" validate="Any" size="40" mode="edit">
-    <en><![CDATA[Title]]></en>
-  </TITLE>
+<TABLE_NAME type="text" maxlength="60" validate="Login" size="40" mode="edit" required="1" mask="">
+  <en><![CDATA[Table Name]]></en>
+</TABLE_NAME>
+<TITLE type="text" maxlength="60" validate="Any" size="40" mode="edit">
+  <en><![CDATA[Title]]></en>
+</TITLE>
 
 <APPLY type="button" onClick="conSaveProperties(0)" >
-    <en><![CDATA[Apply]]></en>
-  </APPLY>
+  <en><![CDATA[Apply]]></en>
+</APPLY>
 
 <JS type="javascript">
   <![CDATA[
@@ -114,5 +114,6 @@
       hideRow('TITLE');
     }
   };
-  ]]></JS>
-</dynaForm>
+  ]]>
+</JS>
+</dynaForm>
\ No newline at end of file