From 50b400679f1ad0dc02e9ffb0e089cefab5d2c671 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Mon, 19 Aug 2013 11:12:01 -0400
Subject: [PATCH 1/4] BUG 12439 "Actions by email: No manda la manda la
 notificacion" SOLVED

- Actions by email: No manda la manda la notificacion
- Problema resuelto, al configurar el Email de tipo "Mail PHP" y utilizando una activacion Actions by Email,
  la notificacion se envia.
* Available from version ProcessMaker-2.5.2-testing.1
---
 workflow/engine/classes/class.wsBase.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index a0bdb95e1..e492c5486 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -971,14 +971,17 @@ class wsBase
             }
 
             $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
-
             $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
 
             if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
-                if (trim($aSetup["MESS_ACCOUNT"]) != "") {
+                if ($aConfiguration["MESS_ENGINE"] != "MAIL" && trim($aSetup["MESS_ACCOUNT"]) != "") {
                     $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
                 } else {
-                    $sFrom = "<info@" . $_SERVER["HTTP_HOST"] . ">";
+                    if ($aConfiguration["MESS_ENGINE"] = "MAIL") {
+                        $sFrom = "\"" . stripslashes($sFrom) . "\"";
+                    } else {
+                        $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
+                    }
                 }
             }
 

From a8999ea7031029d1e442b608cf50f9c3d4757359 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Mon, 19 Aug 2013 15:53:24 -0400
Subject: [PATCH 2/4] BUG 12439 "Actions by email: No manda la manda la
 notificacion" SOLVED

- Actions by email: No manda la manda la notificacion
- Problema resuelto, al configurar el Email de tipo "Mail PHP" y utilizando una activacion Actions by Email,
  la notificacion se envia.
* Available from version ProcessMaker-2.5.2-testing.1
---
 workflow/engine/classes/class.wsBase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index e492c5486..8d5d91048 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -974,10 +974,10 @@ class wsBase
             $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
 
             if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
-                if ($aConfiguration["MESS_ENGINE"] != "MAIL" && trim($aSetup["MESS_ACCOUNT"]) != "") {
+                if (trim($aSetup["MESS_ACCOUNT"]) != "") {
                     $sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
                 } else {
-                    if ($aConfiguration["MESS_ENGINE"] = "MAIL") {
+                    if ($aSetup["MESS_ENGINE"] == "MAIL") {
                         $sFrom = "\"" . stripslashes($sFrom) . "\"";
                     } else {
                         $sFrom = $sFrom . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "")? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";

From 8a91826dc905ae0f22ac1f81041f5475b6410cb4 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 19 Aug 2013 16:27:55 -0400
Subject: [PATCH 3/4] BUG-10543 En IE8 no muestra el texto cuando se habilita
 el scroll horizontal en palabras de mas de 50 caracteres.

Se soluciono la falla en IE8, para palabras de mas de 50 caracteres, cuando se habilita scroll horizontal.
---
 workflow/engine/templates/app/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js
index 0abfe5334..9f326d827 100644
--- a/workflow/engine/templates/app/main.js
+++ b/workflow/engine/templates/app/main.js
@@ -106,7 +106,7 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid)
                       '<td class="x-cnotes-label"><img border="0" src="../users/users_ViewPhotoGrid?pUID={USR_UID}" width="40" height="40"/></td>' +
                       '<td class="x-cnotes-name">'+
                         '<p class="user-from">{user}</p>'+
-                        '<p style="width: 260px; overflow-x:auto;", class="x-editable x-message">{NOTE_CONTENT}</p> '+
+                        '<p style="width: 260px; overflow-x:auto; height: 40px;", class="x-editable x-message">{NOTE_CONTENT}</p> '+
                         '<p class="x-editable"><small>'+_('ID_POSTED_AT')+'<i> {NOTE_DATE}</i></small></p>'+
                       '</td>' +
                     '</tr>' +

From 124bc2b93220eb4a8705a32713b8296b5a7ce48d Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Mon, 19 Aug 2013 16:36:53 -0400
Subject: [PATCH 4/4] BUG Error en la creacion de PMTables SOLVED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Cuando se crea un PMTable dentro del ProcessMaker, al querer seleccionar qué columnas mostrar en el formulario de creación, en la lista se muestra columnas vacías, las cuales no tienen label ni nombre.
- Disabled of hidden fields in rows pmTables.
---
 workflow/engine/templates/pmTables/edit.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js
index 2cfb170a3..e43fa956d 100755
--- a/workflow/engine/templates/pmTables/edit.js
+++ b/workflow/engine/templates/pmTables/edit.js
@@ -145,22 +145,26 @@ Ext.onReady(function(){
       {
           id: 'uid',
           dataIndex: 'uid',
-          hidden: true
+          hidden: true,
+          hideable:false
       },
       {
           id: 'field_uid',
           dataIndex: 'field_uid',
-          hidden: true
+          hidden: true,
+          hideable:false
       },
       {
           id: 'field_key',
           dataIndex: 'field_key',
-          hidden: true
+          hidden: true,
+          hideable:false
       },
       {
           id: 'field_null',
           dataIndex: 'field_null',
-          hidden: true
+          hidden: true,
+          hideable:false
       },
       {
           id: 'field_dyn',