From b133bd50b2451e286b99eeca1393905fecb25fa6 Mon Sep 17 00:00:00 2001
From: qronald <ronald.quenta@processmaker.com>
Date: Thu, 16 Jun 2016 16:23:42 -0400
Subject: [PATCH 01/16] HOR-1312 Agregar el campo GRP_TITLE en la tabla GROUPWF

add method remove in table content
---
 workflow/engine/classes/class.groups.php      |  18 +---
 workflow/engine/classes/class.processMap.php  |  42 ++------
 workflow/engine/classes/class.processes.php   |  27 ++---
 workflow/engine/classes/model/Groupwf.php     | 100 +++++-------------
 .../classes/model/map/GroupwfMapBuilder.php   |   2 +
 .../engine/classes/model/om/BaseGroupwf.php   |  92 +++++++++++++---
 .../classes/model/om/BaseGroupwfPeer.php      |  23 ++--
 workflow/engine/config/schema.xml             |   1 +
 workflow/engine/controllers/dashboard.php     |  13 +--
 workflow/engine/data/mysql/schema.sql         |   1 +
 .../src/ProcessMaker/BusinessModel/Group.php  |  19 +---
 .../BusinessModel/ProcessSupervisor.php       |  16 +--
 .../src/ProcessMaker/BusinessModel/Task.php   |  22 ++--
 13 files changed, 150 insertions(+), 226 deletions(-)

diff --git a/workflow/engine/classes/class.groups.php b/workflow/engine/classes/class.groups.php
index 7ab419557..017728717 100755
--- a/workflow/engine/classes/class.groups.php
+++ b/workflow/engine/classes/class.groups.php
@@ -209,17 +209,11 @@ class Groups
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
-            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-            $oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
             $oCriteria->add(GroupwfPeer::GRP_UID, $gUIDs, Criteria::NOT_IN);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-            $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-            $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-
             if ($filter != '') {
-                $oCriteria->add(ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE);
+                $oCriteria->add(GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE);
             }
-
             return $oCriteria;
         } catch (exception $e) {
             throw $e;
@@ -240,18 +234,12 @@ class Groups
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
-            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
             $oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN);
-            $oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
             $oCriteria->add(GroupUserPeer::USR_UID, $sUserUid, Criteria::EQUAL);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-            $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-            $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-
             if ($filter != '') {
-                $oCriteria->add(ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE);
+                $oCriteria->add(GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE);
             }
-
             return $oCriteria;
         } catch (exception $e) {
             throw $e;
@@ -261,7 +249,7 @@ class Groups
     public function getGroupsForUser($usrUid)
     {
         $criteria = $this->getAssignedGroupsCriteria($usrUid);
-        $criteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+        $criteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
         $dataset = GroupwfPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 679f0c115..6b269e0b4 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -3474,16 +3474,10 @@ class processMap
         );
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-
-        $aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
-        $aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter());
-        $aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $oCriteria->add(GroupwfPeer::GRP_UID, $aGRUS, Criteria::NOT_IN);
 
-        $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+        $oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
         $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
@@ -4068,14 +4062,9 @@ class processMap
         $usersGroups = '<select pm:dependent="0" pm:label="' . G::LoadTranslation('ID_GROUP_USERS') . '" name="form[GROUP_USER]" id="form[GROUP_USER]" class="module_app_input___gray">';
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-        $aConditions = array();
-        $aConditions[] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
-        $aConditions[] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter());
-        $aConditions[] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
-        $oCriteria->addAscendingOrderByColumn('GRP_TITLE');
+        $oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
         $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
@@ -5362,13 +5351,7 @@ class processMap
             $sDelimiter = DBAdapter::getStringDelimiter();
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(GroupwfPeer::GRP_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
             $oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN);
             //$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL);
@@ -6649,12 +6632,7 @@ class processMap
         $aUsersGroups[] = array('UID' => 'char', 'LABEL' => 'char' );
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
-        $aConditions = array();
-        $aConditions[] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID );
-        $aConditions[] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter() );
-        $aConditions[] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
         $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -7004,13 +6982,7 @@ class processMap
             $sDelimiter = DBAdapter::getStringDelimiter();
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-            $oCriteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(GroupwfPeer::GRP_UID, 'C.CON_ID' );
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter );
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
             $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
             $oCriteria->add(GroupwfPeer::GRP_UID, $aUIDS1, Criteria::NOT_IN);
             //$oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL);
diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index 11b11699f..af4523415 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -4326,10 +4326,7 @@ class Processes
             $criteria = new Criteria("workflow");
 
             $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
-            $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-            $criteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
-            $criteria->add(ContentPeer::CON_CATEGORY, "GRP_TITLE", Criteria::EQUAL);
-            $criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL);
+            $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
 
             $rsCriteria = GroupwfPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4349,7 +4346,7 @@ class Processes
                 foreach ($arrayGroupwf as $key2 => $value2) {
                     $groupwfRecord = $value2;
 
-                    if ($groupwfRecord["CON_VALUE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
+                    if ($groupwfRecord["GRP_TITLE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
                         //Update unique id
                         $uidOld = $data->groupwfs[$key]["GRP_UID"];
 
@@ -4763,12 +4760,8 @@ class Processes
         $aGroupwf = array();
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_ID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-        $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-        $oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
-        $oDataset = ContentPeer::doSelectRS($oCriteria);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+        $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
@@ -4779,7 +4772,7 @@ class Processes
         if (is_array($sGroupList)) {
             foreach ($aGroupwf as $groupBase) {
                 foreach ($sGroupList as $group) {
-                    if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
+                    if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
                         $oPro = GroupwfPeer::retrieveByPk( $group['GRP_UID'] );
                         if(is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
                             $group['GRP_UID'] = G::generateUniqueID();
@@ -4843,12 +4836,8 @@ class Processes
     {
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_ID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
-        $oCriteria->add(ContentPeer::CON_LANG, 'en');
-        $oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
-        $oDataset = ContentPeer::doSelectRS($oCriteria);
+        $oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+        $oDataset = GroupwfPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
@@ -4859,7 +4848,7 @@ class Processes
         foreach ($sGroupList as $group) {
             $merged = false;
             foreach ($aGroupwf as $groupBase) {
-                if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
+                if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
                     $group['GRP_UID'] = $groupBase['CON_ID'];
                     $mergedGroupList[] = $group;
                     $merged = true;
diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php
index cfeec6c4f..2295a7f84 100755
--- a/workflow/engine/classes/model/Groupwf.php
+++ b/workflow/engine/classes/model/Groupwf.php
@@ -41,36 +41,15 @@ require_once 'classes/model/Content.php';
  */
 class Groupwf extends BaseGroupwf
 {
-    /**
-     * This value goes in the content table
-     *
-     * @var string
-     */
-    //protected $grp_title = '';
-    protected $grp_title = '';
-
-    /**
-     * Get the [grp_title] column value.
-     *
-     * @return string
-     */
-    public function getGrpTitle ()
-    {
-        if ($this->getGrpUid() == '') {
-            throw (new Exception( "Error in getGrpTitle, the GRP_UID can't be blank" ));
-        }
-        $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-        $this->grp_title = Content::load( 'GRP_TITLE', '', $this->getGrpUid(), $lang );
-        return $this->grp_title;
-    }
 
+    protected $grp_title_content = '';
     /**
      * Set the [grp_title] column value.
      *
      * @param string $v new value
      * @return void
      */
-    public function setGrpTitle ($v)
+    public function setGrpTitleContent ($v)
     {
         if ($this->getGrpUid() == '') {
             throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" ));
@@ -81,15 +60,14 @@ class Groupwf extends BaseGroupwf
             $v = (string) $v;
         }
 
-        if ($this->grp_title !== $v || $v === '') {
-            $this->grp_title = $v;
+        if ($this->grp_title_content !== $v || $v === '') {
+            $this->grp_title_content = $v;
             $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-            $res = Content::addContent( 'GRP_TITLE', '', $this->getGrpUid(), $lang, $this->grp_title );
+            $res = Content::addContent( 'GRP_TITLE', '', $this->getGrpUid(), $lang, $this->grp_title_content );
         }
 
     } // set()
 
-
     /**
      * Creates the Group
      *
@@ -107,6 +85,12 @@ class Groupwf extends BaseGroupwf
                 $this->setGrpUid( G::generateUniqueID() );
             }
 
+            if (isset( $aData['GRP_TITLE'] )) {
+                $this->setGrpTitle( $aData['GRP_TITLE'] );
+            } else {
+                $this->setGrpTitle( 'Default Group Title' );
+            }
+
             if (isset( $aData['GRP_STATUS'] )) {
                 $this->setGrpStatus( $aData['GRP_STATUS'] );
             } else {
@@ -124,9 +108,9 @@ class Groupwf extends BaseGroupwf
                 $res = $this->save();
 
                 if (isset( $aData['GRP_TITLE'] )) {
-                    $this->setGrpTitle( $aData['GRP_TITLE'] );
+                    $this->setGrpTitleContent( $aData['GRP_TITLE'] );
                 } else {
-                    $this->setGrpTitle( 'Default Group Title' );
+                    $this->setGrpTitleContent( 'Default Group Title' );
                 }
 
                 $con->commit();
@@ -160,8 +144,6 @@ class Groupwf extends BaseGroupwf
             if (is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
                 $aFields = $oPro->toArray( BasePeer::TYPE_FIELDNAME );
                 $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
-                $aFields['GRP_TITLE'] = $oPro->getGrpTitle();
-                $this->setGrpTitle( $oPro->getGrpTitle() );
                 return $aFields;
             } else {
                 throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -188,7 +170,7 @@ class Groupwf extends BaseGroupwf
                 $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
                 if ($oPro->validate()) {
                     if (isset( $aData['GRP_TITLE'] )) {
-                        $oPro->setGrpTitle( $aData['GRP_TITLE'] );
+                        $oPro->setGrpTitleContent( $aData['GRP_TITLE'] );
                     }
                     $res = $oPro->save();
                     $con->commit();
@@ -226,7 +208,6 @@ class Groupwf extends BaseGroupwf
             $oPro = GroupwfPeer::retrieveByPK( $ProUid );
             if (! is_null( $oPro )) {
                 Content::removeContent( 'GRP_TITLE', '', $oPro->getGrpUid() );
-                Content::removeContent( 'GRP_DESCRIPTION', '', $oPro->getGrpUid() );
                 return $oPro->delete();
             } else {
                 throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
@@ -263,12 +244,8 @@ class Groupwf extends BaseGroupwf
         $del = DBAdapter::getStringDelimiter();
 
         $c->clearSelectColumns();
-        $c->addSelectColumn( ContentPeer::CON_CATEGORY );
-        $c->addSelectColumn( ContentPeer::CON_VALUE );
-
-        $c->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $c->add( ContentPeer::CON_VALUE, $Groupname );
-        $c->add( ContentPeer::CON_LANG, SYS_LANG );
+        $c->addSelectColumn( GroupwfPeer::GRP_TITLE );
+        $c->add( GroupwfPeer::GRP_TITLE, $Groupname );
         return $c;
     }
 
@@ -297,17 +274,15 @@ class Groupwf extends BaseGroupwf
         $totalCount = 0;
         $criteria = new Criteria( 'workflow' );
         $criteria->addSelectColumn( GroupwfPeer::GRP_UID );
+        $criteria->addSelectColumn( GroupwfPeer::GRP_TITLE );
         $criteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
         $criteria->addSelectColumn( GroupwfPeer::GRP_LDAP_DN );
         $criteria->addSelectColumn( ContentPeer::CON_VALUE );
-        $criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
         $criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG );
-        $criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
+        $criteria->addAscendingOrderByColumn( GroupwfPeer::GRP_TITLE );
 
         if ($search) {
-            $criteria->add( ContentPeer::CON_VALUE, '%' . $search . '%', Criteria::LIKE );
+            $criteria->add( GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE );
         }
 
         $c = clone $criteria;
@@ -349,33 +324,15 @@ class Groupwf extends BaseGroupwf
         require_once 'classes/model/TaskUser.php';
         require_once 'classes/model/GroupUser.php';
         $sDelimiter = DBAdapter::getStringDelimiter();
-        $aConditions = [
-            [GroupwfPeer::GRP_UID, 'C.CON_ID'],
-            ['C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter],
-            ['C.CON_LANG', 'if((SELECT COUNT(S.CON_ID) FROM CONTENT AS S WHERE S.CON_ID=C.CON_ID AND S.CON_CATEGORY=C.CON_CATEGORY AND S.CON_LANG=' . $sDelimiter . SYS_LANG . $sDelimiter . ')>0,' . $sDelimiter . SYS_LANG . $sDelimiter . ',' . $sDelimiter . 'en' . $sDelimiter . ')']
-        ];
-        $totalCount = 0;
-        $criteria = new Criteria('workflow');
-        $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
-        $criteria->addAlias('C', 'CONTENT');
-        $criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-
-        if ($search) {
-            $criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE);
-        }
-
-        $totalRows = GroupwfPeer::doCount($criteria);
 
         $criteria = new Criteria('workflow');
         $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
+        $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
         $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
         $criteria->addSelectColumn(GroupwfPeer::GRP_UX);
-        $criteria->addAlias('C', 'CONTENT');
-        $criteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
-        $criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
 
         if (is_null($sortField) || trim($sortField) == "") {
-            $sortField = 'GRP_TITLE';
+            $sortField = GroupwfPeer::GRP_TITLE;
         }
 
         if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") {
@@ -393,7 +350,7 @@ class Groupwf extends BaseGroupwf
         }
 
         if ($search) {
-            $criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE);
+            $criteria->add(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
         }
 
         $oDataset = GroupwfPeer::doSelectRS($criteria);
@@ -406,7 +363,7 @@ class Groupwf extends BaseGroupwf
             $groups[] = $oDataset->getRow();
         }
 
-        return array('rows' => $groups, 'totalCount' => $totalRows);
+        return array('rows' => $groups, 'totalCount' => count($groups));
     }
 
     public function filterGroup ($filter, $start, $limit)
@@ -426,11 +383,8 @@ class Groupwf extends BaseGroupwf
 
         $oCriteria = new Criteria( 'workflow' );
         $oCriteria->addSelectColumn( GroupwfPeer::GRP_UID );
-        $oCriteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
         if ($filter != '') {
-            $oCriteria->add( ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE );
+            $oCriteria->add( GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE );
         }
         $totalRows = GroupwfPeer::doCount( $oCriteria );
 
@@ -438,14 +392,10 @@ class Groupwf extends BaseGroupwf
         $oCriteria->clearSelectColumns();
         $oCriteria->addSelectColumn( GroupwfPeer::GRP_UID );
         $oCriteria->addSelectColumn( GroupwfPeer::GRP_STATUS );
-        $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
         $oCriteria->addAsColumn( 'GRP_TASKS', 0 );
         $oCriteria->addAsColumn( 'GRP_USERS', 0 );
-        $oCriteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
         if ($filter != '') {
-            $oCriteria->add( ContentPeer::CON_VALUE, '%' . $filter . '%', Criteria::LIKE );
+            $oCriteria->add( GroupwfPeer::GRP_TITLE, '%' . $filter . '%', Criteria::LIKE );
         }
         $oCriteria->setOffset( $start );
         $oCriteria->setLimit( $limit );
diff --git a/workflow/engine/classes/model/map/GroupwfMapBuilder.php b/workflow/engine/classes/model/map/GroupwfMapBuilder.php
index a6c7bf436..02da56fb2 100755
--- a/workflow/engine/classes/model/map/GroupwfMapBuilder.php
+++ b/workflow/engine/classes/model/map/GroupwfMapBuilder.php
@@ -67,6 +67,8 @@ class GroupwfMapBuilder
 
         $tMap->addPrimaryKey('GRP_UID', 'GrpUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('GRP_TITLE', 'GrpTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
         $tMap->addColumn('GRP_STATUS', 'GrpStatus', 'string', CreoleTypes::CHAR, true, 8);
 
         $tMap->addColumn('GRP_LDAP_DN', 'GrpLdapDn', 'string', CreoleTypes::VARCHAR, true, 255);
diff --git a/workflow/engine/classes/model/om/BaseGroupwf.php b/workflow/engine/classes/model/om/BaseGroupwf.php
index 948522ea8..ad010636b 100755
--- a/workflow/engine/classes/model/om/BaseGroupwf.php
+++ b/workflow/engine/classes/model/om/BaseGroupwf.php
@@ -31,7 +31,13 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
      * The value for the grp_uid field.
      * @var        string
      */
-    protected $grp_uid = '';
+    protected $grp_uid;
+
+    /**
+     * The value for the grp_title field.
+     * @var        string
+     */
+    protected $grp_title;
 
     /**
      * The value for the grp_status field.
@@ -76,6 +82,17 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
         return $this->grp_uid;
     }
 
+    /**
+     * Get the [grp_title] column value.
+     * 
+     * @return     string
+     */
+    public function getGrpTitle()
+    {
+
+        return $this->grp_title;
+    }
+
     /**
      * Get the [grp_status] column value.
      * 
@@ -124,13 +141,35 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
             $v = (string) $v;
         }
 
-        if ($this->grp_uid !== $v || $v === '') {
+        if ($this->grp_uid !== $v) {
             $this->grp_uid = $v;
             $this->modifiedColumns[] = GroupwfPeer::GRP_UID;
         }
 
     } // setGrpUid()
 
+    /**
+     * Set the value of [grp_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setGrpTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->grp_title !== $v) {
+            $this->grp_title = $v;
+            $this->modifiedColumns[] = GroupwfPeer::GRP_TITLE;
+        }
+
+    } // setGrpTitle()
+
     /**
      * Set the value of [grp_status] column.
      * 
@@ -216,18 +255,20 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
 
             $this->grp_uid = $rs->getString($startcol + 0);
 
-            $this->grp_status = $rs->getString($startcol + 1);
+            $this->grp_title = $rs->getString($startcol + 1);
 
-            $this->grp_ldap_dn = $rs->getString($startcol + 2);
+            $this->grp_status = $rs->getString($startcol + 2);
 
-            $this->grp_ux = $rs->getString($startcol + 3);
+            $this->grp_ldap_dn = $rs->getString($startcol + 3);
+
+            $this->grp_ux = $rs->getString($startcol + 4);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 4; // 4 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 5; // 5 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Groupwf object", $e);
@@ -435,12 +476,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
                 return $this->getGrpUid();
                 break;
             case 1:
-                return $this->getGrpStatus();
+                return $this->getGrpTitle();
                 break;
             case 2:
-                return $this->getGrpLdapDn();
+                return $this->getGrpStatus();
                 break;
             case 3:
+                return $this->getGrpLdapDn();
+                break;
+            case 4:
                 return $this->getGrpUx();
                 break;
             default:
@@ -464,9 +508,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
         $keys = GroupwfPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getGrpUid(),
-            $keys[1] => $this->getGrpStatus(),
-            $keys[2] => $this->getGrpLdapDn(),
-            $keys[3] => $this->getGrpUx(),
+            $keys[1] => $this->getGrpTitle(),
+            $keys[2] => $this->getGrpStatus(),
+            $keys[3] => $this->getGrpLdapDn(),
+            $keys[4] => $this->getGrpUx(),
         );
         return $result;
     }
@@ -502,12 +547,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
                 $this->setGrpUid($value);
                 break;
             case 1:
-                $this->setGrpStatus($value);
+                $this->setGrpTitle($value);
                 break;
             case 2:
-                $this->setGrpLdapDn($value);
+                $this->setGrpStatus($value);
                 break;
             case 3:
+                $this->setGrpLdapDn($value);
+                break;
+            case 4:
                 $this->setGrpUx($value);
                 break;
         } // switch()
@@ -538,15 +586,19 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setGrpStatus($arr[$keys[1]]);
+            $this->setGrpTitle($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setGrpLdapDn($arr[$keys[2]]);
+            $this->setGrpStatus($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setGrpUx($arr[$keys[3]]);
+            $this->setGrpLdapDn($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setGrpUx($arr[$keys[4]]);
         }
 
     }
@@ -564,6 +616,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
             $criteria->add(GroupwfPeer::GRP_UID, $this->grp_uid);
         }
 
+        if ($this->isColumnModified(GroupwfPeer::GRP_TITLE)) {
+            $criteria->add(GroupwfPeer::GRP_TITLE, $this->grp_title);
+        }
+
         if ($this->isColumnModified(GroupwfPeer::GRP_STATUS)) {
             $criteria->add(GroupwfPeer::GRP_STATUS, $this->grp_status);
         }
@@ -630,6 +686,8 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setGrpTitle($this->grp_title);
+
         $copyObj->setGrpStatus($this->grp_status);
 
         $copyObj->setGrpLdapDn($this->grp_ldap_dn);
@@ -639,7 +697,7 @@ abstract class BaseGroupwf extends BaseObject implements Persistent
 
         $copyObj->setNew(true);
 
-        $copyObj->setGrpUid(''); // this is a pkey column, so set to default value
+        $copyObj->setGrpUid(NULL); // this is a pkey column, so set to default value
 
     }
 
diff --git a/workflow/engine/classes/model/om/BaseGroupwfPeer.php b/workflow/engine/classes/model/om/BaseGroupwfPeer.php
index d90262069..13567c5fb 100755
--- a/workflow/engine/classes/model/om/BaseGroupwfPeer.php
+++ b/workflow/engine/classes/model/om/BaseGroupwfPeer.php
@@ -25,7 +25,7 @@ abstract class BaseGroupwfPeer
     const CLASS_DEFAULT = 'classes.model.Groupwf';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 4;
+    const NUM_COLUMNS = 5;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseGroupwfPeer
     /** the column name for the GRP_UID field */
     const GRP_UID = 'GROUPWF.GRP_UID';
 
+    /** the column name for the GRP_TITLE field */
+    const GRP_TITLE = 'GROUPWF.GRP_TITLE';
+
     /** the column name for the GRP_STATUS field */
     const GRP_STATUS = 'GROUPWF.GRP_STATUS';
 
@@ -54,10 +57,10 @@ abstract class BaseGroupwfPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ),
-        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ),
-        BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
+        BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpTitle', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ),
+        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_TITLE, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ),
+        BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_TITLE', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
     );
 
     /**
@@ -67,10 +70,10 @@ abstract class BaseGroupwfPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpStatus' => 1, 'GrpLdapDn' => 2, 'GrpUx' => 3, ),
-        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_STATUS => 1, GroupwfPeer::GRP_LDAP_DN => 2, GroupwfPeer::GRP_UX => 3, ),
-        BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_STATUS' => 1, 'GRP_LDAP_DN' => 2, 'GRP_UX' => 3, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
+        BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpTitle' => 1, 'GrpStatus' => 2, 'GrpLdapDn' => 3, 'GrpUx' => 4, ),
+        BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_TITLE => 1, GroupwfPeer::GRP_STATUS => 2, GroupwfPeer::GRP_LDAP_DN => 3, GroupwfPeer::GRP_UX => 4, ),
+        BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_TITLE' => 1, 'GRP_STATUS' => 2, 'GRP_LDAP_DN' => 3, 'GRP_UX' => 4, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
     );
 
     /**
@@ -173,6 +176,8 @@ abstract class BaseGroupwfPeer
 
         $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
 
+        $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+
         $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
 
         $criteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 6395c2024..f8a13ad51 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -532,6 +532,7 @@
       <parameter name="Comment" value=""/>
     </vendor>
     <column name="GRP_UID" type="VARCHAR" size="32" required="true" primaryKey="true"/>
+    <column name="GRP_TITLE" type="LONGVARCHAR" required="true"/>
     <column name="GRP_STATUS" type="CHAR" size="8" required="true" default="ACTIVE"/>
     <column name="GRP_LDAP_DN" type="VARCHAR" size="255" required="true" default=""/>
     <column name="GRP_UX" type="VARCHAR" size="128" default="NORMAL"/>
diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index bc7d469c2..a4c233d16 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -390,20 +390,11 @@ class Dashboard extends Controller
                     $criteria = new Criteria( 'workflow' );
                     $criteria->setDistinct();
                     $criteria->addSelectColumn( GroupwfPeer::GRP_UID );
-                    $criteria->addSelectColumn( ContentPeer::CON_VALUE );
-                    //FROM
-                    $conditions = array ();
-                    $conditions[] = array (GroupwfPeer::GRP_UID,ContentPeer::CON_ID
-                    );
-                    $conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'GRP_TITLE' . DBAdapter::getStringDelimiter()
-                    );
-                    $conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
-                    );
-                    $criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
+                    $criteria->addSelectColumn( GroupwfPeer::GRP_TITLE );
                     //WHERE
                     $criteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
                     //ORDER BY
-                    $criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
+                    $criteria->addAscendingOrderByColumn( GroupwfPeer::GRP_TITLE );
 
                     $dataset = GroupwfPeer::doSelectRS( $criteria );
                     $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 09d25a82e..328dc3742 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -244,6 +244,7 @@ DROP TABLE IF EXISTS `GROUPWF`;
 CREATE TABLE `GROUPWF`
 (
 	`GRP_UID` VARCHAR(32)  NOT NULL,
+	`GRP_TITLE` MEDIUMTEXT  NOT NULL,
 	`GRP_STATUS` CHAR(8) default 'ACTIVE' NOT NULL,
 	`GRP_LDAP_DN` VARCHAR(255) default '' NOT NULL,
 	`GRP_UX` VARCHAR(128) default 'NORMAL',
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Group.php b/workflow/engine/src/ProcessMaker/BusinessModel/Group.php
index 8dd719b6f..8a4681175 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Group.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Group.php
@@ -102,20 +102,13 @@ class Group
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\GroupwfPeer::GRP_UID);
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\GroupwfPeer::GRP_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
+            $criteria->addSelectColumn(\GroupwfPeer::GRP_TITLE);
 
             if ($groupUidExclude != "") {
                 $criteria->add(\GroupwfPeer::GRP_UID, $groupUidExclude, \Criteria::NOT_EQUAL);
             }
 
-            $criteria->add("CT.CON_VALUE", $groupTitle, \Criteria::EQUAL);
+            $criteria->add(\GroupwfPeer::GRP_TITLE, $groupTitle, \Criteria::EQUAL);
 
             $rsCriteria = \GroupwfPeer::doSelectRS($criteria);
 
@@ -314,14 +307,10 @@ class Group
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\GroupwfPeer::GRP_UID);
+            $criteria->addSelectColumn(\GroupwfPeer::GRP_TITLE);
             $criteria->addSelectColumn(\GroupwfPeer::GRP_STATUS);
             $criteria->addSelectColumn(\GroupwfPeer::GRP_LDAP_DN);
             $criteria->addSelectColumn(\GroupwfPeer::GRP_UX);
-            $criteria->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
-            $criteria->addJoin(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN);
-            $criteria->add(\ContentPeer::CON_CATEGORY, "GRP_TITLE", \Criteria::EQUAL);
-            $criteria->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL);
-
             return $criteria;
         } catch (\Exception $e) {
             throw $e;
@@ -508,7 +497,7 @@ class Group
 
                 $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
 
-                $criteria->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
+                $criteria->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
             }
 
             //Number records total
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
index e0b809835..5f99b63f1 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
@@ -111,7 +111,7 @@ class ProcessSupervisor
                 $criteriaGroup = new \Criteria("workflow");
 
                 $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID);
-                $criteriaGroup->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
+                $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_TITLE);
 
                 switch ($option) {
                     case "ASSIGNED":
@@ -122,12 +122,6 @@ class ProcessSupervisor
                         $arrayCondition[] = array(\GroupwfPeer::GRP_STATUS, $delimiter . "ACTIVE" . $delimiter, \Criteria::EQUAL);
                         $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
 
-                        $arrayCondition = array();
-                        $arrayCondition[] = array(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_CATEGORY, $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-                        $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
                         $criteriaGroup->add(\ProcessUserPeer::PU_TYPE, "GROUP_SUPERVISOR", \Criteria::EQUAL);
                         $criteriaGroup->add(\ProcessUserPeer::PRO_UID, $processUid, \Criteria::EQUAL);
                         break;
@@ -145,12 +139,6 @@ class ProcessSupervisor
                                " . \PermissionsPeer::PER_SYSTEM . " = " . $delimiter . $arrayRbacSystemData["SYS_CODE"] . $delimiter . "
                         ";
 
-                        $arrayCondition = array();
-                        $arrayCondition[] = array(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_CATEGORY, $delimiter . "GRP_TITLE" . $delimiter, \Criteria::EQUAL);
-                        $arrayCondition[] = array(\ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-                        $criteriaGroup->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
                         $criteriaGroup->add(
                             $criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_UID, $arrayGroupUid, \Criteria::NOT_IN)->addAnd(
                             $criteriaGroup->getNewCriterion(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL))->addAnd(
@@ -168,7 +156,7 @@ class ProcessSupervisor
 
                     $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
 
-                    $criteriaGroup->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
+                    $criteriaGroup->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
                 }
 
                 //Number records total
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index d4de092b6..1e8fbb876 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -909,7 +909,7 @@ class Task
                 $criteriaGroup = new \Criteria("workflow");
 
                 $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_UID);
-                $criteriaGroup->addAsColumn("GRP_TITLE", \ContentPeer::CON_VALUE);
+                $criteriaGroup->addSelectColumn(\GroupwfPeer::GRP_TITLE);
 
                 switch ($option) {
                     case "ASSIGNEE":
@@ -923,10 +923,6 @@ class Task
                         break;
                 }
 
-                $criteriaGroup->addJoin(\GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN);
-                $criteriaGroup->add(\ContentPeer::CON_CATEGORY, "GRP_TITLE", \Criteria::EQUAL);
-                $criteriaGroup->add(\ContentPeer::CON_LANG, SYS_LANG, \Criteria::EQUAL);
-
                 if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]) && trim($arrayFilterData["filter"]) != "") {
                     $arraySearch = array(
                         ""      => "%" . $arrayFilterData["filter"] . "%",
@@ -936,7 +932,7 @@ class Task
 
                     $search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
 
-                    $criteriaGroup->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
+                    $criteriaGroup->add(\GroupwfPeer::GRP_TITLE, $search, \Criteria::LIKE);
                 }
 
                 $criteriaGroup->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL);
@@ -1212,12 +1208,9 @@ class Task
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
-            $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
-            $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
-            $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-            $criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
+            $criteria->addSelectColumn( \GroupwfPeer::GRP_TITLE );
             $criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
-            $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
+            $criteria->addAscendingOrderByColumn( \GroupwfPeer::GRP_TITLE );
             $oDataset = \GroupwfPeer::doSelectRS( $criteria );
             $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
             $groups = array ();
@@ -1434,14 +1427,11 @@ class Task
             }
             $criteria = new \Criteria( 'workflow' );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
+            $criteria->addSelectColumn( \GroupwfPeer::GRP_TITLE );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
             $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
-            $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
-            $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
-            $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
-            $criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
             $criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
-            $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
+            $criteria->addAscendingOrderByColumn( \GroupwfPeer::GRP_TITLE );
             $oDataset = \GroupwfPeer::doSelectRS( $criteria );
             $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
             $groups = array ();

From c6e803c6f019d2649a9edeb1cdcf6a169f5df7a0 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Mon, 20 Jun 2016 16:50:57 -0400
Subject: [PATCH 02/16] HOR-1329 Agregar los campos PRO_TITLE y PRO_DESCRIPTION
 en la tabla PROCESS

---
 workflow/engine/classes/class.AppSolr.php     |  20 +-
 workflow/engine/classes/class.case.php        |  39 +-
 workflow/engine/classes/class.pmFunctions.php |   8 +-
 workflow/engine/classes/class.processes.php   |   8 +-
 workflow/engine/classes/class.wsBase.php      |   2 +-
 workflow/engine/classes/model/Process.php     | 208 ++------
 .../classes/model/map/ProcessMapBuilder.php   |   4 +
 .../engine/classes/model/om/BaseProcess.php   | 454 +++++++++++-------
 .../classes/model/om/BaseProcessPeer.php      |  28 +-
 workflow/engine/config/schema.xml             |   2 +
 workflow/engine/controllers/home.php          |  12 +-
 workflow/engine/data/mysql/schema.sql         |   2 +
 .../cases/casesConsolidatedListExtJs.php      |  10 +-
 .../engine/methods/cases/casesList_Ajax.php   |  11 +-
 .../cases/cases_SchedulerGetProcesses.php     |   5 +-
 .../src/ProcessMaker/BusinessModel/Cases.php  |  15 +-
 .../src/ProcessMaker/BusinessModel/Light.php  |  17 +-
 .../ProcessMaker/BusinessModel/Process.php    |  11 +-
 18 files changed, 393 insertions(+), 463 deletions(-)

diff --git a/workflow/engine/classes/class.AppSolr.php b/workflow/engine/classes/class.AppSolr.php
index b57cdf1b6..31897f136 100755
--- a/workflow/engine/classes/class.AppSolr.php
+++ b/workflow/engine/classes/class.AppSolr.php
@@ -2734,7 +2734,7 @@ class AppSolr
     $c->addSelectColumn (ApplicationPeer::APP_DATA);
   
     $c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE');
-    $c->addAsColumn ('PRO_TITLE', 'cpro.CON_VALUE');
+    $c->addSelectColumn ('pro.PRO_TITLE');
   
     $c->addSelectColumn ('ad.DEL_INDEX');
     $c->addSelectColumn ('ad.DEL_PREVIOUS');
@@ -2767,7 +2767,6 @@ class AppSolr
     $c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY");
 
     $c->addAlias ('capp', 'CONTENT');
-    $c->addAlias ('cpro', 'CONTENT');
     $c->addAlias ('ad', 'APP_DELEGATION');
     $c->addAlias ('at', 'APP_THREAD');
     $c->addAlias ('ade', 'APP_DELAY');
@@ -2787,22 +2786,7 @@ class AppSolr
         DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
     );
     $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-  
-    $aConditions = array ();
-    $aConditions [] = array (
-        ApplicationPeer::PRO_UID,
-        'cpro.CON_ID'
-    );
-    $aConditions [] = array (
-        'cpro.CON_CATEGORY',
-        DBAdapter::getStringDelimiter () . 'PRO_TITLE' . DBAdapter::getStringDelimiter ()
-    );
-    $aConditions [] = array (
-        'cpro.CON_LANG',
-        DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
-    );
-    $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-  
+    $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
     $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);
   
     $aConditions = array ();
diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index c79d0f0a3..98adf5bc9 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -200,10 +200,9 @@ class Cases
         $c = new Criteria();
         $c->addSelectColumn(TaskPeer::TAS_UID);
         $c->addSelectColumn(TaskPeer::PRO_UID);
+        $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-        $c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
         $c->addAlias('C1', 'CONTENT');
-        $c->addAlias('C2', 'CONTENT');
         $aConditions = array();
         $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
         $aConditions[] = array(
@@ -213,15 +212,7 @@ class Cases
             'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
         );
         $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
-        $aConditions[] = array(
-            'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $aConditions[] = array(
-            'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
         $c->addAscendingOrderByColumn('PRO_TITLE');
         $c->addAscendingOrderByColumn('TAS_TITLE');
@@ -304,10 +295,9 @@ class Cases
         $c = new Criteria();
         $c->addSelectColumn(TaskPeer::TAS_UID);
         $c->addSelectColumn(TaskPeer::PRO_UID);
+        $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-        $c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
         $c->addAlias('C1', 'CONTENT');
-        $c->addAlias('C2', 'CONTENT');
         if ($typeView == 'category') {
             $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
             $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
@@ -330,15 +320,7 @@ class Cases
             'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
         );
         $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
-        $aConditions[] = array(
-            'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $aConditions[] = array(
-            'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
 
         $c->addAscendingOrderByColumn('PRO_TITLE');
@@ -447,10 +429,9 @@ class Cases
         $c = new Criteria();
         $c->addSelectColumn(TaskPeer::TAS_UID);
         $c->addSelectColumn(TaskPeer::PRO_UID);
+        $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-        $c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
         $c->addAlias('C1', 'CONTENT');
-        $c->addAlias('C2', 'CONTENT');
         $aConditions = array();
         $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
         $aConditions[] = array(
@@ -460,15 +441,7 @@ class Cases
             'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
         );
         $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
-        $aConditions[] = array(
-            'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $aConditions[] = array(
-            'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
         $c->addAscendingOrderByColumn('PRO_TITLE');
         $c->addAscendingOrderByColumn('TAS_TITLE');
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 5776a3669..c2cc9dbf1 100755
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -3033,12 +3033,8 @@ function PMFGetProcessUidByName($processName = '')
         $criteria = new Criteria('workflow');
 
         $criteria->addSelectColumn(ProcessPeer::PRO_UID);
-
-        $criteria->addJoin(ContentPeer::CON_ID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
-        $criteria->add(ContentPeer::CON_VALUE, $processName, Criteria::EQUAL);
-        $criteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL);
-
-        $rsCriteria = ContentPeer::doSelectRS($criteria);
+        $criteria->add(ProcessPeer::PRO_TITLE, $processName, Criteria::EQUAL);
+        $rsCriteria = ProcessPeer::doSelectRS($criteria);
         $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
         if ($rsCriteria->next()) {
diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index 11b11699f..b47a98cf2 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -5941,13 +5941,7 @@ class Processes
             $criteria = new Criteria("workflow");
 
             $criteria->addSelectColumn(ProcessPeer::PRO_UID);
-            $criteria->addAsColumn("PRO_TITLE", ContentPeer::CON_VALUE);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::EQUAL);
-            $arrayCondition[] = array(ContentPeer::CON_CATEGORY, $delimiter . "PRO_TITLE" . $delimiter, Criteria::EQUAL);
-            $arrayCondition[] = array(ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
+            $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
 
             if ($processUid != "") {
                 $criteria->add(ProcessPeer::PRO_UID, $processUid, Criteria::EQUAL);
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 583b4a96e..1b92381e6 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -178,7 +178,7 @@ class wsBase
 
             while ($aRow = $oDataset->getRow()) {
                 $oProcess = new Process();
-                $arrayProcess = $oProcess->Load( $aRow['PRO_UID'] );
+                $arrayProcess = $oProcess->load( $aRow['PRO_UID'] );
                 $result[] = array ('guid' => $aRow['PRO_UID'],'name' => $arrayProcess['PRO_TITLE']
                 );
                 $oDataset->next();
diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php
index 6902e742a..2e1fd66af 100755
--- a/workflow/engine/classes/model/Process.php
+++ b/workflow/engine/classes/model/Process.php
@@ -47,7 +47,7 @@ class Process extends BaseProcess
      *
      * @var string
      */
-    protected $pro_title = '';
+    protected $pro_title_content = '';
     public $dir = 'ASC';
     public $sort = 'PRO_TITLE';
 
@@ -56,14 +56,14 @@ class Process extends BaseProcess
      *
      * @return string
      */
-    public function getProTitle ()
+    public function getProTitleContent ()
     {
         if ($this->getProUid() == '') {
             throw (new Exception( "Error in getProTitle, the PRO_UID can't be blank" ));
         }
         $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-        $this->pro_title = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang );
-        return $this->pro_title;
+        $this->pro_title_content = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang );
+        return $this->pro_title_content;
     }
 
     /**
@@ -72,7 +72,7 @@ class Process extends BaseProcess
      * @param string $v new value
      * @return void
      */
-    public function setProTitle ($v)
+    public function setProTitleContent ($v)
     {
         if ($this->getProUid() == '') {
             throw (new Exception( "Error in setProTitle, the PRO_UID can't be blank" . print_r( debug_backtrace(), 1 ) ));
@@ -83,11 +83,11 @@ class Process extends BaseProcess
             $v = (string) $v;
         }
 
-        if ($this->pro_title !== $v || $v === '') {
-            $this->pro_title = $v;
+        if ($this->pro_title_content !== $v || $v === '') {
+            $this->pro_title_content = $v;
             $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
 
-            $res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title );
+            $res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title_content );
         }
 
     } // set()
@@ -98,21 +98,21 @@ class Process extends BaseProcess
      *
      * @var string
      */
-    protected $pro_description = '';
+    protected $pro_description_content = '';
 
     /**
      * Get the [Pro_description] column value.
      *
      * @return string
      */
-    public function getProDescription ()
+    public function getProDescriptionContent ()
     {
         if ($this->getProUid() == '') {
             throw (new Exception( "Error in getProDescription, the PRO_UID can't be blank" ));
         }
         $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-        $this->pro_description = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang );
-        return $this->pro_description;
+        $this->pro_description_content = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang );
+        return $this->pro_description_content;
     }
 
     /**
@@ -121,7 +121,7 @@ class Process extends BaseProcess
      * @param string $v new value
      * @return void
      */
-    public function setProDescription ($v)
+    public function setProDescriptionContent ($v)
     {
         if ($this->getProUid() == '') {
             throw (new Exception( "Error in setProDescription, the PRO_UID can't be blank" ));
@@ -132,11 +132,11 @@ class Process extends BaseProcess
             $v = (string) $v;
         }
 
-        if ($this->pro_description !== $v || $v === '') {
-            $this->pro_description = $v;
+        if ($this->pro_description_content !== $v || $v === '') {
+            $this->pro_description_content = $v;
             $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
 
-            $res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description );
+            $res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description_content );
         }
 
     } // set()
@@ -168,6 +168,8 @@ class Process extends BaseProcess
             }
 
             $this->setProUid( $sNewProUid );
+            $this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
+            $this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
             $this->setProParent( $sNewProUid );
             $this->setProTime( 1 );
             $this->setProTimeunit( 'DAYS' );
@@ -195,15 +197,15 @@ class Process extends BaseProcess
                 $res = $this->save();
 
                 if (isset( $aData['PRO_TITLE'] )) {
-                    $this->setProTitle( $aData['PRO_TITLE'] );
+                    $this->setProTitleContent( $aData['PRO_TITLE'] );
                 } else {
-                    $this->setProTitle( 'Default Process Title' );
+                    $this->setProTitleContent( 'Default Process Title' );
                 }
 
                 if (isset( $aData['PRO_DESCRIPTION'] )) {
-                    $this->setProDescription( $aData['PRO_DESCRIPTION'] );
+                    $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
                 } else {
-                    $this->setProDescription( 'Default Process Description' );
+                    $this->setProDescriptionContent( 'Default Process Description' );
                 }
 
                 $con->commit();
@@ -264,52 +266,6 @@ class Process extends BaseProcess
                 //        $this->pro_title = $aFields['PRO_TITLE'];
                 //        $this->pro_description = $aFields['PRO_DESCRIPTION'];
 
-                $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-
-                $c = new Criteria();
-                $c->clearSelectColumns();
-                $c->addSelectColumn( ContentPeer::CON_CATEGORY );
-                $c->addSelectColumn( ContentPeer::CON_VALUE );
-                $c->add( ContentPeer::CON_ID, $ProUid );
-                if (! $getAllLang) {
-                    $c->add( ContentPeer::CON_LANG, $lang );
-                }
-                $rs = ProcessPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
-                $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-                $rs->next();
-                $row = $rs->getRow();
-
-                while (is_array( $row )) {
-                    switch ($row['CON_CATEGORY']) {
-                        case 'PRO_TITLE':
-                            $aFields['PRO_TITLE'] = $row['CON_VALUE'];
-                            $this->pro_title = $row['CON_VALUE'];
-                            if ($row['CON_VALUE'] !== '') {
-                                $this->setProTitle( $aFields['PRO_TITLE'] );
-                            }
-                            break;
-                        case 'PRO_DESCRIPTION':
-                            $aFields['PRO_DESCRIPTION'] = $row['CON_VALUE'];
-                            $this->pro_description = $row['CON_VALUE'];
-                            if ($row['CON_VALUE'] !== '') {
-                                $this->setProDescription( $aFields['PRO_DESCRIPTION'] );
-                            }
-                            break;
-                    }
-                    $rs->next();
-                    $row = $rs->getRow();
-                }
-
-                //If the prev script doesn't return anithing try to create the values based on EN
-                if (! isset( $aFields['PRO_TITLE'] )) {
-                    $aFields['PRO_TITLE'] = $oPro->getProTitle();
-                    $this->setProTitle( $aFields['PRO_TITLE'] );
-                }
-                if (! isset( $aFields['PRO_DESCRIPTION'] )) {
-                    $aFields['PRO_DESCRIPTION'] = $oPro->getProDescription();
-                    $this->setProDescription( $aFields['PRO_DESCRIPTION'] );
-                }
-
                 //the following code is to copy the parent in old process, when the parent was empty.
                 if ($oPro->getProParent() == '') {
                     $oPro->setProParent( $oPro->getProUid() );
@@ -345,6 +301,8 @@ class Process extends BaseProcess
         $oCriteria = new Criteria( 'workflow' );
 
         $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
+        $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
+        $oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
         $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
         $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
         $oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY );
@@ -366,39 +324,11 @@ class Process extends BaseProcess
             $processes[] = $row;
             $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
         }
-        //process details will have the info about the processes
-        $processesDetails = Array ();
-
-        //now get the labels for all process, using an array of Uids,
-        $c = new Criteria( 'workflow' );
-        //$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $c->add( ContentPeer::CON_LANG, defined( 'SYS_LANG' ) ? SYS_LANG : 'en', Criteria::EQUAL );
-        $c->add( ContentPeer::CON_ID, $uids, Criteria::IN );
-
-        $dt = ContentPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
-        $dt->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-
-        while ($dt->next()) {
-            $row = $dt->getRow();
-            $processesDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
-        }
 
         G::loadClass( 'configuration' );
         $oConf = new Configurations();
         $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
 
-        foreach ($processes as $i => $process) {
-            $processes[$i]['PRO_TITLE'] = $processes[$i]['PRO_DESCRIPTION'] = '';
-
-            if (isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] )) {
-                $processes[$i]['PRO_TITLE'] = $processesDetails[$process['PRO_UID']]['PRO_TITLE'];
-            }
-
-            if (isset( $processesDetails[$process['PRO_UID']] )) {
-                $processes[$i]['PRO_DESCRIPTION'] = $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'];
-            }
-        }
-
         if ($this->dir=='ASC') {
         	usort( $processes, array($this, "ordProcessAsc") );
         } else {
@@ -429,10 +359,10 @@ class Process extends BaseProcess
                 $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
                 if ($oPro->validate()) {
                     if (isset( $aData['PRO_TITLE'] )) {
-                        $oPro->setProTitle( $aData['PRO_TITLE'] );
+                        $oPro->setProTitleContent( $aData['PRO_TITLE'] );
                     }
                     if (isset( $aData['PRO_DESCRIPTION'] )) {
-                        $oPro->setProDescription( $aData['PRO_DESCRIPTION'] );
+                        $oPro->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
                     }
                     $res = $oPro->save();
                     $con->commit();
@@ -469,6 +399,8 @@ class Process extends BaseProcess
         $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
         //$con->begin(); //does not allow dual BEGIN
         $this->setProUid( $aData['PRO_UID'] );
+        $this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
+        $this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
         $this->setProParent( $aData['PRO_PARENT'] );
         $this->setProTime( $aData['PRO_TIME'] );
         $this->setProTimeunit( $aData['PRO_TIMEUNIT'] );
@@ -514,14 +446,14 @@ class Process extends BaseProcess
             $res = $this->save();
 
             if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') {
-                $this->setProTitle( $aData['PRO_TITLE'] );
+                $this->setProTitleContent( $aData['PRO_TITLE'] );
             } else {
-                $this->setProTitle( 'Default Process Title' );
+                $this->setProTitleContent( 'Default Process Title' );
             }
             if (isset( $aData['PRO_DESCRIPTION'] )) {
-                $this->setProDescription( $aData['PRO_DESCRIPTION'] );
+                $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
             } else {
-                $this->setProDescription( 'Default Process Description' );
+                $this->setProDescriptionContent( 'Default Process Description' );
             }
             $con->commit();
 
@@ -556,9 +488,7 @@ class Process extends BaseProcess
             if (! is_null( $oPro )) {
                 Content::removeContent( 'PRO_TITLE', '', $oPro->getProUid() );
                 Content::removeContent( 'PRO_DESCRIPTION', '', $oPro->getProUid() );
-
                 $this->memcachedDelete();
-
                 return $oPro->delete();
             } else {
                 throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" ));
@@ -577,61 +507,44 @@ class Process extends BaseProcess
     public static function existsByProTitle ($proTitle)
     {
         $oCriteria = new Criteria("workflow");
-
-        $oCriteria->addSelectColumn("COUNT(" . ContentPeer::CON_ID . ") AS NUM_REC");
-
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
-        $oCriteria->add( ContentPeer::CON_VALUE, $proTitle );
-        $oDataset = ContentPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $oCriteria->add( ProcessPeer::PRO_TITLE, $proTitle );
+        $oDataset = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-
         $oDataset->next();
         $aRow = $oDataset->getRow();
-
-        return ((int)($aRow["NUM_REC"]) > 0)? true : false;
+        return ($aRow)? true : false;
     }
 
-    public static function getByProTitle($proTitle) {
+    public static function getByProTitle($proTitle)
+    {
         $oCriteria = new Criteria("workflow");
-
-        $oCriteria->addSelectColumn(ContentPeer::CON_ID);
-
-        $oCriteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE');
-        $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-        $oCriteria->add(ContentPeer::CON_VALUE, $proTitle);
-        $oDataset = ContentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+        $oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle);
+        $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
         $oDataset->next();
         $aRow = $oDataset->getRow();
-        $oProcess = new Process();
-        return isset($aRow["CON_ID"]) ? $oProcess->load($aRow["CON_ID"]) : null;
+        return isset($aRow) ? $aRow : null;
     }
 
-    public static function getNextTitle($proTitle) {
+    public static function getNextTitle($proTitle)
+    {
         $oCriteria = new Criteria('workflow');
-
-        $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-
-        $oCriteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE');
-        $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
-        $oCriteria->add(ContentPeer::CON_VALUE, $proTitle . '-%', Criteria::LIKE);
-        $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
-
-        $oDataset = ContentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle . '-%', Criteria::LIKE);
+        $oCriteria->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
+        $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
         $data = array();
         $may = 0;
         while ($oDataset->next()) {
             $row = $oDataset->getRow();
-            $number = explode("-", $row["CON_VALUE"]);
+            $number = explode("-", $row["PRO_TITLE"]);
             $number = $number[count($number) - 1] + 0;
             if ($number > $may) {
                 $may = $number;
             }
-            $row["CON_VALUE"] = $number;
+            $row["PRO_TITLE"] = $number;
             $data[] = $row;
         }
         return $proTitle . "-" . ($may + 1);
@@ -665,6 +578,8 @@ class Process extends BaseProcess
         $oCriteria = new Criteria( 'workflow' );
 
         $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
+        $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
+        $oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
         $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
         $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
         $oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE);
@@ -744,30 +659,13 @@ class Process extends BaseProcess
             $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
         }
 
-        //process details will have the info about the processes
-        $processesDetails = Array ();
-
-        //now get the labels for all process, using an array of Uids,
-        $c = new Criteria( 'workflow' );
-        //$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $c->add( ContentPeer::CON_LANG, defined( 'SYS_LANG' ) ? SYS_LANG : 'en', Criteria::EQUAL );
-        $c->add( ContentPeer::CON_ID, $uids, Criteria::IN );
-
-        $dt = ContentPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
-        $dt->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-
-        while ($dt->next()) {
-            $row = $dt->getRow();
-            $processesDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
-        }
-
         G::loadClass( 'configuration' );
         $oConf = new Configurations();
         $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
 
         foreach ($processes as $process) {
-            $proTitle = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] ) ? $processesDetails[$process['PRO_UID']]['PRO_TITLE'] : '';
-            $proDescription = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] ) ? $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] : '';
+            $proTitle = isset($process['PRO_TITLE'])? $process['PRO_TITLE'] : '';
+            $proDescription = isset($process['PRO_DESCRIPTION']) ? $process['PRO_DESCRIPTION'] : '';
             $process["PRO_TYPE_PROCESS"] = ($process["PRO_TYPE_PROCESS"] == "PUBLIC") ? G::LoadTranslation("ID_PUBLIC") : G::LoadTranslation("ID_PRIVATE");
 
             // verify if the title is already set on the current language
diff --git a/workflow/engine/classes/model/map/ProcessMapBuilder.php b/workflow/engine/classes/model/map/ProcessMapBuilder.php
index 087ea7644..d67ae2215 100755
--- a/workflow/engine/classes/model/map/ProcessMapBuilder.php
+++ b/workflow/engine/classes/model/map/ProcessMapBuilder.php
@@ -67,6 +67,10 @@ class ProcessMapBuilder
 
         $tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('PRO_TITLE', 'ProTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
+        $tMap->addColumn('PRO_DESCRIPTION', 'ProDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
         $tMap->addColumn('PRO_PARENT', 'ProParent', 'string', CreoleTypes::VARCHAR, true, 32);
 
         $tMap->addColumn('PRO_TIME', 'ProTime', 'double', CreoleTypes::DOUBLE, true, null);
diff --git a/workflow/engine/classes/model/om/BaseProcess.php b/workflow/engine/classes/model/om/BaseProcess.php
index ec86bef92..42ad2256c 100755
--- a/workflow/engine/classes/model/om/BaseProcess.php
+++ b/workflow/engine/classes/model/om/BaseProcess.php
@@ -33,6 +33,18 @@ abstract class BaseProcess extends BaseObject implements Persistent
      */
     protected $pro_uid = '';
 
+    /**
+     * The value for the pro_title field.
+     * @var        string
+     */
+    protected $pro_title;
+
+    /**
+     * The value for the pro_description field.
+     * @var        string
+     */
+    protected $pro_description;
+
     /**
      * The value for the pro_parent field.
      * @var        string
@@ -262,6 +274,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
         return $this->pro_uid;
     }
 
+    /**
+     * Get the [pro_title] column value.
+     * 
+     * @return     string
+     */
+    public function getProTitle()
+    {
+
+        return $this->pro_title;
+    }
+
+    /**
+     * Get the [pro_description] column value.
+     * 
+     * @return     string
+     */
+    public function getProDescription()
+    {
+
+        return $this->pro_description;
+    }
+
     /**
      * Get the [pro_parent] column value.
      * 
@@ -700,6 +734,50 @@ abstract class BaseProcess extends BaseObject implements Persistent
 
     } // setProUid()
 
+    /**
+     * Set the value of [pro_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setProTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->pro_title !== $v) {
+            $this->pro_title = $v;
+            $this->modifiedColumns[] = ProcessPeer::PRO_TITLE;
+        }
+
+    } // setProTitle()
+
+    /**
+     * Set the value of [pro_description] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setProDescription($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->pro_description !== $v) {
+            $this->pro_description = $v;
+            $this->modifiedColumns[] = ProcessPeer::PRO_DESCRIPTION;
+        }
+
+    } // setProDescription()
+
     /**
      * Set the value of [pro_parent] column.
      * 
@@ -1469,80 +1547,84 @@ abstract class BaseProcess extends BaseObject implements Persistent
 
             $this->pro_uid = $rs->getString($startcol + 0);
 
-            $this->pro_parent = $rs->getString($startcol + 1);
+            $this->pro_title = $rs->getString($startcol + 1);
 
-            $this->pro_time = $rs->getFloat($startcol + 2);
+            $this->pro_description = $rs->getString($startcol + 2);
 
-            $this->pro_timeunit = $rs->getString($startcol + 3);
+            $this->pro_parent = $rs->getString($startcol + 3);
 
-            $this->pro_status = $rs->getString($startcol + 4);
+            $this->pro_time = $rs->getFloat($startcol + 4);
 
-            $this->pro_type_day = $rs->getString($startcol + 5);
+            $this->pro_timeunit = $rs->getString($startcol + 5);
 
-            $this->pro_type = $rs->getString($startcol + 6);
+            $this->pro_status = $rs->getString($startcol + 6);
 
-            $this->pro_assignment = $rs->getString($startcol + 7);
+            $this->pro_type_day = $rs->getString($startcol + 7);
 
-            $this->pro_show_map = $rs->getInt($startcol + 8);
+            $this->pro_type = $rs->getString($startcol + 8);
 
-            $this->pro_show_message = $rs->getInt($startcol + 9);
+            $this->pro_assignment = $rs->getString($startcol + 9);
 
-            $this->pro_subprocess = $rs->getInt($startcol + 10);
+            $this->pro_show_map = $rs->getInt($startcol + 10);
 
-            $this->pro_tri_open = $rs->getString($startcol + 11);
+            $this->pro_show_message = $rs->getInt($startcol + 11);
 
-            $this->pro_tri_deleted = $rs->getString($startcol + 12);
+            $this->pro_subprocess = $rs->getInt($startcol + 12);
 
-            $this->pro_tri_canceled = $rs->getString($startcol + 13);
+            $this->pro_tri_open = $rs->getString($startcol + 13);
 
-            $this->pro_tri_paused = $rs->getString($startcol + 14);
+            $this->pro_tri_deleted = $rs->getString($startcol + 14);
 
-            $this->pro_tri_reassigned = $rs->getString($startcol + 15);
+            $this->pro_tri_canceled = $rs->getString($startcol + 15);
 
-            $this->pro_tri_unpaused = $rs->getString($startcol + 16);
+            $this->pro_tri_paused = $rs->getString($startcol + 16);
 
-            $this->pro_type_process = $rs->getString($startcol + 17);
+            $this->pro_tri_reassigned = $rs->getString($startcol + 17);
 
-            $this->pro_show_delegate = $rs->getInt($startcol + 18);
+            $this->pro_tri_unpaused = $rs->getString($startcol + 18);
 
-            $this->pro_show_dynaform = $rs->getInt($startcol + 19);
+            $this->pro_type_process = $rs->getString($startcol + 19);
 
-            $this->pro_category = $rs->getString($startcol + 20);
+            $this->pro_show_delegate = $rs->getInt($startcol + 20);
 
-            $this->pro_sub_category = $rs->getString($startcol + 21);
+            $this->pro_show_dynaform = $rs->getInt($startcol + 21);
 
-            $this->pro_industry = $rs->getInt($startcol + 22);
+            $this->pro_category = $rs->getString($startcol + 22);
 
-            $this->pro_update_date = $rs->getTimestamp($startcol + 23, null);
+            $this->pro_sub_category = $rs->getString($startcol + 23);
 
-            $this->pro_create_date = $rs->getTimestamp($startcol + 24, null);
+            $this->pro_industry = $rs->getInt($startcol + 24);
 
-            $this->pro_create_user = $rs->getString($startcol + 25);
+            $this->pro_update_date = $rs->getTimestamp($startcol + 25, null);
 
-            $this->pro_height = $rs->getInt($startcol + 26);
+            $this->pro_create_date = $rs->getTimestamp($startcol + 26, null);
 
-            $this->pro_width = $rs->getInt($startcol + 27);
+            $this->pro_create_user = $rs->getString($startcol + 27);
 
-            $this->pro_title_x = $rs->getInt($startcol + 28);
+            $this->pro_height = $rs->getInt($startcol + 28);
 
-            $this->pro_title_y = $rs->getInt($startcol + 29);
+            $this->pro_width = $rs->getInt($startcol + 29);
 
-            $this->pro_debug = $rs->getInt($startcol + 30);
+            $this->pro_title_x = $rs->getInt($startcol + 30);
 
-            $this->pro_dynaforms = $rs->getString($startcol + 31);
+            $this->pro_title_y = $rs->getInt($startcol + 31);
 
-            $this->pro_derivation_screen_tpl = $rs->getString($startcol + 32);
+            $this->pro_debug = $rs->getInt($startcol + 32);
 
-            $this->pro_cost = $rs->getFloat($startcol + 33);
+            $this->pro_dynaforms = $rs->getString($startcol + 33);
 
-            $this->pro_unit_cost = $rs->getString($startcol + 34);
+            $this->pro_derivation_screen_tpl = $rs->getString($startcol + 34);
+
+            $this->pro_cost = $rs->getFloat($startcol + 35);
+
+            $this->pro_unit_cost = $rs->getString($startcol + 36);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 35; // 35 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 37; // 37 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Process object", $e);
@@ -1750,105 +1832,111 @@ abstract class BaseProcess extends BaseObject implements Persistent
                 return $this->getProUid();
                 break;
             case 1:
-                return $this->getProParent();
+                return $this->getProTitle();
                 break;
             case 2:
-                return $this->getProTime();
+                return $this->getProDescription();
                 break;
             case 3:
-                return $this->getProTimeunit();
+                return $this->getProParent();
                 break;
             case 4:
-                return $this->getProStatus();
+                return $this->getProTime();
                 break;
             case 5:
-                return $this->getProTypeDay();
+                return $this->getProTimeunit();
                 break;
             case 6:
-                return $this->getProType();
+                return $this->getProStatus();
                 break;
             case 7:
-                return $this->getProAssignment();
+                return $this->getProTypeDay();
                 break;
             case 8:
-                return $this->getProShowMap();
+                return $this->getProType();
                 break;
             case 9:
-                return $this->getProShowMessage();
+                return $this->getProAssignment();
                 break;
             case 10:
-                return $this->getProSubprocess();
+                return $this->getProShowMap();
                 break;
             case 11:
-                return $this->getProTriOpen();
+                return $this->getProShowMessage();
                 break;
             case 12:
-                return $this->getProTriDeleted();
+                return $this->getProSubprocess();
                 break;
             case 13:
-                return $this->getProTriCanceled();
+                return $this->getProTriOpen();
                 break;
             case 14:
-                return $this->getProTriPaused();
+                return $this->getProTriDeleted();
                 break;
             case 15:
-                return $this->getProTriReassigned();
+                return $this->getProTriCanceled();
                 break;
             case 16:
-                return $this->getProTriUnpaused();
+                return $this->getProTriPaused();
                 break;
             case 17:
-                return $this->getProTypeProcess();
+                return $this->getProTriReassigned();
                 break;
             case 18:
-                return $this->getProShowDelegate();
+                return $this->getProTriUnpaused();
                 break;
             case 19:
-                return $this->getProShowDynaform();
+                return $this->getProTypeProcess();
                 break;
             case 20:
-                return $this->getProCategory();
+                return $this->getProShowDelegate();
                 break;
             case 21:
-                return $this->getProSubCategory();
+                return $this->getProShowDynaform();
                 break;
             case 22:
-                return $this->getProIndustry();
+                return $this->getProCategory();
                 break;
             case 23:
-                return $this->getProUpdateDate();
+                return $this->getProSubCategory();
                 break;
             case 24:
-                return $this->getProCreateDate();
+                return $this->getProIndustry();
                 break;
             case 25:
-                return $this->getProCreateUser();
+                return $this->getProUpdateDate();
                 break;
             case 26:
-                return $this->getProHeight();
+                return $this->getProCreateDate();
                 break;
             case 27:
-                return $this->getProWidth();
+                return $this->getProCreateUser();
                 break;
             case 28:
-                return $this->getProTitleX();
+                return $this->getProHeight();
                 break;
             case 29:
-                return $this->getProTitleY();
+                return $this->getProWidth();
                 break;
             case 30:
-                return $this->getProDebug();
+                return $this->getProTitleX();
                 break;
             case 31:
-                return $this->getProDynaforms();
+                return $this->getProTitleY();
                 break;
             case 32:
-                return $this->getProDerivationScreenTpl();
+                return $this->getProDebug();
                 break;
             case 33:
-                return $this->getProCost();
+                return $this->getProDynaforms();
                 break;
             case 34:
+                return $this->getProDerivationScreenTpl();
+                break;
+            case 35:
+                return $this->getProCost();
+                break;
+            case 36:
                 return $this->getProUnitCost();
                 break;
             default:
@@ -1872,40 +1960,42 @@ abstract class BaseProcess extends BaseObject implements Persistent
         $keys = ProcessPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getProUid(),
-            $keys[1] => $this->getProParent(),
-            $keys[2] => $this->getProTime(),
-            $keys[3] => $this->getProTimeunit(),
-            $keys[4] => $this->getProStatus(),
-            $keys[5] => $this->getProTypeDay(),
-            $keys[6] => $this->getProType(),
-            $keys[7] => $this->getProAssignment(),
-            $keys[8] => $this->getProShowMap(),
-            $keys[9] => $this->getProShowMessage(),
-            $keys[10] => $this->getProSubprocess(),
-            $keys[11] => $this->getProTriOpen(),
-            $keys[12] => $this->getProTriDeleted(),
-            $keys[13] => $this->getProTriCanceled(),
-            $keys[14] => $this->getProTriPaused(),
-            $keys[15] => $this->getProTriReassigned(),
-            $keys[16] => $this->getProTriUnpaused(),
-            $keys[17] => $this->getProTypeProcess(),
-            $keys[18] => $this->getProShowDelegate(),
-            $keys[19] => $this->getProShowDynaform(),
-            $keys[20] => $this->getProCategory(),
-            $keys[21] => $this->getProSubCategory(),
-            $keys[22] => $this->getProIndustry(),
-            $keys[23] => $this->getProUpdateDate(),
-            $keys[24] => $this->getProCreateDate(),
-            $keys[25] => $this->getProCreateUser(),
-            $keys[26] => $this->getProHeight(),
-            $keys[27] => $this->getProWidth(),
-            $keys[28] => $this->getProTitleX(),
-            $keys[29] => $this->getProTitleY(),
-            $keys[30] => $this->getProDebug(),
-            $keys[31] => $this->getProDynaforms(),
-            $keys[32] => $this->getProDerivationScreenTpl(),
-            $keys[33] => $this->getProCost(),
-            $keys[34] => $this->getProUnitCost(),
+            $keys[1] => $this->getProTitle(),
+            $keys[2] => $this->getProDescription(),
+            $keys[3] => $this->getProParent(),
+            $keys[4] => $this->getProTime(),
+            $keys[5] => $this->getProTimeunit(),
+            $keys[6] => $this->getProStatus(),
+            $keys[7] => $this->getProTypeDay(),
+            $keys[8] => $this->getProType(),
+            $keys[9] => $this->getProAssignment(),
+            $keys[10] => $this->getProShowMap(),
+            $keys[11] => $this->getProShowMessage(),
+            $keys[12] => $this->getProSubprocess(),
+            $keys[13] => $this->getProTriOpen(),
+            $keys[14] => $this->getProTriDeleted(),
+            $keys[15] => $this->getProTriCanceled(),
+            $keys[16] => $this->getProTriPaused(),
+            $keys[17] => $this->getProTriReassigned(),
+            $keys[18] => $this->getProTriUnpaused(),
+            $keys[19] => $this->getProTypeProcess(),
+            $keys[20] => $this->getProShowDelegate(),
+            $keys[21] => $this->getProShowDynaform(),
+            $keys[22] => $this->getProCategory(),
+            $keys[23] => $this->getProSubCategory(),
+            $keys[24] => $this->getProIndustry(),
+            $keys[25] => $this->getProUpdateDate(),
+            $keys[26] => $this->getProCreateDate(),
+            $keys[27] => $this->getProCreateUser(),
+            $keys[28] => $this->getProHeight(),
+            $keys[29] => $this->getProWidth(),
+            $keys[30] => $this->getProTitleX(),
+            $keys[31] => $this->getProTitleY(),
+            $keys[32] => $this->getProDebug(),
+            $keys[33] => $this->getProDynaforms(),
+            $keys[34] => $this->getProDerivationScreenTpl(),
+            $keys[35] => $this->getProCost(),
+            $keys[36] => $this->getProUnitCost(),
         );
         return $result;
     }
@@ -1941,105 +2031,111 @@ abstract class BaseProcess extends BaseObject implements Persistent
                 $this->setProUid($value);
                 break;
             case 1:
-                $this->setProParent($value);
+                $this->setProTitle($value);
                 break;
             case 2:
-                $this->setProTime($value);
+                $this->setProDescription($value);
                 break;
             case 3:
-                $this->setProTimeunit($value);
+                $this->setProParent($value);
                 break;
             case 4:
-                $this->setProStatus($value);
+                $this->setProTime($value);
                 break;
             case 5:
-                $this->setProTypeDay($value);
+                $this->setProTimeunit($value);
                 break;
             case 6:
-                $this->setProType($value);
+                $this->setProStatus($value);
                 break;
             case 7:
-                $this->setProAssignment($value);
+                $this->setProTypeDay($value);
                 break;
             case 8:
-                $this->setProShowMap($value);
+                $this->setProType($value);
                 break;
             case 9:
-                $this->setProShowMessage($value);
+                $this->setProAssignment($value);
                 break;
             case 10:
-                $this->setProSubprocess($value);
+                $this->setProShowMap($value);
                 break;
             case 11:
-                $this->setProTriOpen($value);
+                $this->setProShowMessage($value);
                 break;
             case 12:
-                $this->setProTriDeleted($value);
+                $this->setProSubprocess($value);
                 break;
             case 13:
-                $this->setProTriCanceled($value);
+                $this->setProTriOpen($value);
                 break;
             case 14:
-                $this->setProTriPaused($value);
+                $this->setProTriDeleted($value);
                 break;
             case 15:
-                $this->setProTriReassigned($value);
+                $this->setProTriCanceled($value);
                 break;
             case 16:
-                $this->setProTriUnpaused($value);
+                $this->setProTriPaused($value);
                 break;
             case 17:
-                $this->setProTypeProcess($value);
+                $this->setProTriReassigned($value);
                 break;
             case 18:
-                $this->setProShowDelegate($value);
+                $this->setProTriUnpaused($value);
                 break;
             case 19:
-                $this->setProShowDynaform($value);
+                $this->setProTypeProcess($value);
                 break;
             case 20:
-                $this->setProCategory($value);
+                $this->setProShowDelegate($value);
                 break;
             case 21:
-                $this->setProSubCategory($value);
+                $this->setProShowDynaform($value);
                 break;
             case 22:
-                $this->setProIndustry($value);
+                $this->setProCategory($value);
                 break;
             case 23:
-                $this->setProUpdateDate($value);
+                $this->setProSubCategory($value);
                 break;
             case 24:
-                $this->setProCreateDate($value);
+                $this->setProIndustry($value);
                 break;
             case 25:
-                $this->setProCreateUser($value);
+                $this->setProUpdateDate($value);
                 break;
             case 26:
-                $this->setProHeight($value);
+                $this->setProCreateDate($value);
                 break;
             case 27:
-                $this->setProWidth($value);
+                $this->setProCreateUser($value);
                 break;
             case 28:
-                $this->setProTitleX($value);
+                $this->setProHeight($value);
                 break;
             case 29:
-                $this->setProTitleY($value);
+                $this->setProWidth($value);
                 break;
             case 30:
-                $this->setProDebug($value);
+                $this->setProTitleX($value);
                 break;
             case 31:
-                $this->setProDynaforms($value);
+                $this->setProTitleY($value);
                 break;
             case 32:
-                $this->setProDerivationScreenTpl($value);
+                $this->setProDebug($value);
                 break;
             case 33:
-                $this->setProCost($value);
+                $this->setProDynaforms($value);
                 break;
             case 34:
+                $this->setProDerivationScreenTpl($value);
+                break;
+            case 35:
+                $this->setProCost($value);
+                break;
+            case 36:
                 $this->setProUnitCost($value);
                 break;
         } // switch()
@@ -2070,139 +2166,147 @@ abstract class BaseProcess extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setProParent($arr[$keys[1]]);
+            $this->setProTitle($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setProTime($arr[$keys[2]]);
+            $this->setProDescription($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setProTimeunit($arr[$keys[3]]);
+            $this->setProParent($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setProStatus($arr[$keys[4]]);
+            $this->setProTime($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setProTypeDay($arr[$keys[5]]);
+            $this->setProTimeunit($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setProType($arr[$keys[6]]);
+            $this->setProStatus($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setProAssignment($arr[$keys[7]]);
+            $this->setProTypeDay($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setProShowMap($arr[$keys[8]]);
+            $this->setProType($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setProShowMessage($arr[$keys[9]]);
+            $this->setProAssignment($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setProSubprocess($arr[$keys[10]]);
+            $this->setProShowMap($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setProTriOpen($arr[$keys[11]]);
+            $this->setProShowMessage($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setProTriDeleted($arr[$keys[12]]);
+            $this->setProSubprocess($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setProTriCanceled($arr[$keys[13]]);
+            $this->setProTriOpen($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setProTriPaused($arr[$keys[14]]);
+            $this->setProTriDeleted($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setProTriReassigned($arr[$keys[15]]);
+            $this->setProTriCanceled($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setProTriUnpaused($arr[$keys[16]]);
+            $this->setProTriPaused($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setProTypeProcess($arr[$keys[17]]);
+            $this->setProTriReassigned($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setProShowDelegate($arr[$keys[18]]);
+            $this->setProTriUnpaused($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setProShowDynaform($arr[$keys[19]]);
+            $this->setProTypeProcess($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setProCategory($arr[$keys[20]]);
+            $this->setProShowDelegate($arr[$keys[20]]);
         }
 
         if (array_key_exists($keys[21], $arr)) {
-            $this->setProSubCategory($arr[$keys[21]]);
+            $this->setProShowDynaform($arr[$keys[21]]);
         }
 
         if (array_key_exists($keys[22], $arr)) {
-            $this->setProIndustry($arr[$keys[22]]);
+            $this->setProCategory($arr[$keys[22]]);
         }
 
         if (array_key_exists($keys[23], $arr)) {
-            $this->setProUpdateDate($arr[$keys[23]]);
+            $this->setProSubCategory($arr[$keys[23]]);
         }
 
         if (array_key_exists($keys[24], $arr)) {
-            $this->setProCreateDate($arr[$keys[24]]);
+            $this->setProIndustry($arr[$keys[24]]);
         }
 
         if (array_key_exists($keys[25], $arr)) {
-            $this->setProCreateUser($arr[$keys[25]]);
+            $this->setProUpdateDate($arr[$keys[25]]);
         }
 
         if (array_key_exists($keys[26], $arr)) {
-            $this->setProHeight($arr[$keys[26]]);
+            $this->setProCreateDate($arr[$keys[26]]);
         }
 
         if (array_key_exists($keys[27], $arr)) {
-            $this->setProWidth($arr[$keys[27]]);
+            $this->setProCreateUser($arr[$keys[27]]);
         }
 
         if (array_key_exists($keys[28], $arr)) {
-            $this->setProTitleX($arr[$keys[28]]);
+            $this->setProHeight($arr[$keys[28]]);
         }
 
         if (array_key_exists($keys[29], $arr)) {
-            $this->setProTitleY($arr[$keys[29]]);
+            $this->setProWidth($arr[$keys[29]]);
         }
 
         if (array_key_exists($keys[30], $arr)) {
-            $this->setProDebug($arr[$keys[30]]);
+            $this->setProTitleX($arr[$keys[30]]);
         }
 
         if (array_key_exists($keys[31], $arr)) {
-            $this->setProDynaforms($arr[$keys[31]]);
+            $this->setProTitleY($arr[$keys[31]]);
         }
 
         if (array_key_exists($keys[32], $arr)) {
-            $this->setProDerivationScreenTpl($arr[$keys[32]]);
+            $this->setProDebug($arr[$keys[32]]);
         }
 
         if (array_key_exists($keys[33], $arr)) {
-            $this->setProCost($arr[$keys[33]]);
+            $this->setProDynaforms($arr[$keys[33]]);
         }
 
         if (array_key_exists($keys[34], $arr)) {
-            $this->setProUnitCost($arr[$keys[34]]);
+            $this->setProDerivationScreenTpl($arr[$keys[34]]);
+        }
+
+        if (array_key_exists($keys[35], $arr)) {
+            $this->setProCost($arr[$keys[35]]);
+        }
+
+        if (array_key_exists($keys[36], $arr)) {
+            $this->setProUnitCost($arr[$keys[36]]);
         }
 
     }
@@ -2220,6 +2324,14 @@ abstract class BaseProcess extends BaseObject implements Persistent
             $criteria->add(ProcessPeer::PRO_UID, $this->pro_uid);
         }
 
+        if ($this->isColumnModified(ProcessPeer::PRO_TITLE)) {
+            $criteria->add(ProcessPeer::PRO_TITLE, $this->pro_title);
+        }
+
+        if ($this->isColumnModified(ProcessPeer::PRO_DESCRIPTION)) {
+            $criteria->add(ProcessPeer::PRO_DESCRIPTION, $this->pro_description);
+        }
+
         if ($this->isColumnModified(ProcessPeer::PRO_PARENT)) {
             $criteria->add(ProcessPeer::PRO_PARENT, $this->pro_parent);
         }
@@ -2410,6 +2522,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setProTitle($this->pro_title);
+
+        $copyObj->setProDescription($this->pro_description);
+
         $copyObj->setProParent($this->pro_parent);
 
         $copyObj->setProTime($this->pro_time);
diff --git a/workflow/engine/classes/model/om/BaseProcessPeer.php b/workflow/engine/classes/model/om/BaseProcessPeer.php
index 11aea4ff8..0ed8b31fc 100755
--- a/workflow/engine/classes/model/om/BaseProcessPeer.php
+++ b/workflow/engine/classes/model/om/BaseProcessPeer.php
@@ -25,7 +25,7 @@ abstract class BaseProcessPeer
     const CLASS_DEFAULT = 'classes.model.Process';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 35;
+    const NUM_COLUMNS = 37;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseProcessPeer
     /** the column name for the PRO_UID field */
     const PRO_UID = 'PROCESS.PRO_UID';
 
+    /** the column name for the PRO_TITLE field */
+    const PRO_TITLE = 'PROCESS.PRO_TITLE';
+
+    /** the column name for the PRO_DESCRIPTION field */
+    const PRO_DESCRIPTION = 'PROCESS.PRO_DESCRIPTION';
+
     /** the column name for the PRO_PARENT field */
     const PRO_PARENT = 'PROCESS.PRO_PARENT';
 
@@ -147,10 +153,10 @@ abstract class BaseProcessPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', ),
-        BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_OPEN, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_TYPE_PROCESS, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ),
-        BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_OPEN', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_TYPE_PROCESS', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', 'PRO_COST', 'PRO_UNIT_COST', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, )
+        BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', ),
+        BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_OPEN, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_TYPE_PROCESS, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ),
+        BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_TITLE', 'PRO_DESCRIPTION', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_OPEN', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_TYPE_PROCESS', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', 'PRO_COST', 'PRO_UNIT_COST', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, )
     );
 
     /**
@@ -160,10 +166,10 @@ abstract class BaseProcessPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProParent' => 1, 'ProTime' => 2, 'ProTimeunit' => 3, 'ProStatus' => 4, 'ProTypeDay' => 5, 'ProType' => 6, 'ProAssignment' => 7, 'ProShowMap' => 8, 'ProShowMessage' => 9, 'ProSubprocess' => 10, 'ProTriOpen' => 11, 'ProTriDeleted' => 12, 'ProTriCanceled' => 13, 'ProTriPaused' => 14, 'ProTriReassigned' => 15, 'ProTriUnpaused' => 16, 'ProTypeProcess' => 17, 'ProShowDelegate' => 18, 'ProShowDynaform' => 19, 'ProCategory' => 20, 'ProSubCategory' => 21, 'ProIndustry' => 22, 'ProUpdateDate' => 23, 'ProCreateDate' => 24, 'ProCreateUser' => 25, 'ProHeight' => 26, 'ProWidth' => 27, 'ProTitleX' => 28, 'ProTitleY' => 29, 'ProDebug' => 30, 'ProDynaforms' => 31, 'ProDerivationScreenTpl' => 32, 'ProCost' => 33, 'ProUnitCost' => 34, ),
-        BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_PARENT => 1, ProcessPeer::PRO_TIME => 2, ProcessPeer::PRO_TIMEUNIT => 3, ProcessPeer::PRO_STATUS => 4, ProcessPeer::PRO_TYPE_DAY => 5, ProcessPeer::PRO_TYPE => 6, ProcessPeer::PRO_ASSIGNMENT => 7, ProcessPeer::PRO_SHOW_MAP => 8, ProcessPeer::PRO_SHOW_MESSAGE => 9, ProcessPeer::PRO_SUBPROCESS => 10, ProcessPeer::PRO_TRI_OPEN => 11, ProcessPeer::PRO_TRI_DELETED => 12, ProcessPeer::PRO_TRI_CANCELED => 13, ProcessPeer::PRO_TRI_PAUSED => 14, ProcessPeer::PRO_TRI_REASSIGNED => 15, ProcessPeer::PRO_TRI_UNPAUSED => 16, ProcessPeer::PRO_TYPE_PROCESS => 17, ProcessPeer::PRO_SHOW_DELEGATE => 18, ProcessPeer::PRO_SHOW_DYNAFORM => 19, ProcessPeer::PRO_CATEGORY => 20, ProcessPeer::PRO_SUB_CATEGORY => 21, ProcessPeer::PRO_INDUSTRY => 22, ProcessPeer::PRO_UPDATE_DATE => 23, ProcessPeer::PRO_CREATE_DATE => 24, ProcessPeer::PRO_CREATE_USER => 25, ProcessPeer::PRO_HEIGHT => 26, ProcessPeer::PRO_WIDTH => 27, ProcessPeer::PRO_TITLE_X => 28, ProcessPeer::PRO_TITLE_Y => 29, ProcessPeer::PRO_DEBUG => 30, ProcessPeer::PRO_DYNAFORMS => 31, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 32, ProcessPeer::PRO_COST => 33, ProcessPeer::PRO_UNIT_COST => 34, ),
-        BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_PARENT' => 1, 'PRO_TIME' => 2, 'PRO_TIMEUNIT' => 3, 'PRO_STATUS' => 4, 'PRO_TYPE_DAY' => 5, 'PRO_TYPE' => 6, 'PRO_ASSIGNMENT' => 7, 'PRO_SHOW_MAP' => 8, 'PRO_SHOW_MESSAGE' => 9, 'PRO_SUBPROCESS' => 10, 'PRO_TRI_OPEN' => 11, 'PRO_TRI_DELETED' => 12, 'PRO_TRI_CANCELED' => 13, 'PRO_TRI_PAUSED' => 14, 'PRO_TRI_REASSIGNED' => 15, 'PRO_TRI_UNPAUSED' => 16, 'PRO_TYPE_PROCESS' => 17, 'PRO_SHOW_DELEGATE' => 18, 'PRO_SHOW_DYNAFORM' => 19, 'PRO_CATEGORY' => 20, 'PRO_SUB_CATEGORY' => 21, 'PRO_INDUSTRY' => 22, 'PRO_UPDATE_DATE' => 23, 'PRO_CREATE_DATE' => 24, 'PRO_CREATE_USER' => 25, 'PRO_HEIGHT' => 26, 'PRO_WIDTH' => 27, 'PRO_TITLE_X' => 28, 'PRO_TITLE_Y' => 29, 'PRO_DEBUG' => 30, 'PRO_DYNAFORMS' => 31, 'PRO_DERIVATION_SCREEN_TPL' => 32, 'PRO_COST' => 33, 'PRO_UNIT_COST' => 34, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, )
+        BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProTitle' => 1, 'ProDescription' => 2, 'ProParent' => 3, 'ProTime' => 4, 'ProTimeunit' => 5, 'ProStatus' => 6, 'ProTypeDay' => 7, 'ProType' => 8, 'ProAssignment' => 9, 'ProShowMap' => 10, 'ProShowMessage' => 11, 'ProSubprocess' => 12, 'ProTriOpen' => 13, 'ProTriDeleted' => 14, 'ProTriCanceled' => 15, 'ProTriPaused' => 16, 'ProTriReassigned' => 17, 'ProTriUnpaused' => 18, 'ProTypeProcess' => 19, 'ProShowDelegate' => 20, 'ProShowDynaform' => 21, 'ProCategory' => 22, 'ProSubCategory' => 23, 'ProIndustry' => 24, 'ProUpdateDate' => 25, 'ProCreateDate' => 26, 'ProCreateUser' => 27, 'ProHeight' => 28, 'ProWidth' => 29, 'ProTitleX' => 30, 'ProTitleY' => 31, 'ProDebug' => 32, 'ProDynaforms' => 33, 'ProDerivationScreenTpl' => 34, 'ProCost' => 35, 'ProUnitCost' => 36, ),
+        BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_TITLE => 1, ProcessPeer::PRO_DESCRIPTION => 2, ProcessPeer::PRO_PARENT => 3, ProcessPeer::PRO_TIME => 4, ProcessPeer::PRO_TIMEUNIT => 5, ProcessPeer::PRO_STATUS => 6, ProcessPeer::PRO_TYPE_DAY => 7, ProcessPeer::PRO_TYPE => 8, ProcessPeer::PRO_ASSIGNMENT => 9, ProcessPeer::PRO_SHOW_MAP => 10, ProcessPeer::PRO_SHOW_MESSAGE => 11, ProcessPeer::PRO_SUBPROCESS => 12, ProcessPeer::PRO_TRI_OPEN => 13, ProcessPeer::PRO_TRI_DELETED => 14, ProcessPeer::PRO_TRI_CANCELED => 15, ProcessPeer::PRO_TRI_PAUSED => 16, ProcessPeer::PRO_TRI_REASSIGNED => 17, ProcessPeer::PRO_TRI_UNPAUSED => 18, ProcessPeer::PRO_TYPE_PROCESS => 19, ProcessPeer::PRO_SHOW_DELEGATE => 20, ProcessPeer::PRO_SHOW_DYNAFORM => 21, ProcessPeer::PRO_CATEGORY => 22, ProcessPeer::PRO_SUB_CATEGORY => 23, ProcessPeer::PRO_INDUSTRY => 24, ProcessPeer::PRO_UPDATE_DATE => 25, ProcessPeer::PRO_CREATE_DATE => 26, ProcessPeer::PRO_CREATE_USER => 27, ProcessPeer::PRO_HEIGHT => 28, ProcessPeer::PRO_WIDTH => 29, ProcessPeer::PRO_TITLE_X => 30, ProcessPeer::PRO_TITLE_Y => 31, ProcessPeer::PRO_DEBUG => 32, ProcessPeer::PRO_DYNAFORMS => 33, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 34, ProcessPeer::PRO_COST => 35, ProcessPeer::PRO_UNIT_COST => 36, ),
+        BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_TITLE' => 1, 'PRO_DESCRIPTION' => 2, 'PRO_PARENT' => 3, 'PRO_TIME' => 4, 'PRO_TIMEUNIT' => 5, 'PRO_STATUS' => 6, 'PRO_TYPE_DAY' => 7, 'PRO_TYPE' => 8, 'PRO_ASSIGNMENT' => 9, 'PRO_SHOW_MAP' => 10, 'PRO_SHOW_MESSAGE' => 11, 'PRO_SUBPROCESS' => 12, 'PRO_TRI_OPEN' => 13, 'PRO_TRI_DELETED' => 14, 'PRO_TRI_CANCELED' => 15, 'PRO_TRI_PAUSED' => 16, 'PRO_TRI_REASSIGNED' => 17, 'PRO_TRI_UNPAUSED' => 18, 'PRO_TYPE_PROCESS' => 19, 'PRO_SHOW_DELEGATE' => 20, 'PRO_SHOW_DYNAFORM' => 21, 'PRO_CATEGORY' => 22, 'PRO_SUB_CATEGORY' => 23, 'PRO_INDUSTRY' => 24, 'PRO_UPDATE_DATE' => 25, 'PRO_CREATE_DATE' => 26, 'PRO_CREATE_USER' => 27, 'PRO_HEIGHT' => 28, 'PRO_WIDTH' => 29, 'PRO_TITLE_X' => 30, 'PRO_TITLE_Y' => 31, 'PRO_DEBUG' => 32, 'PRO_DYNAFORMS' => 33, 'PRO_DERIVATION_SCREEN_TPL' => 34, 'PRO_COST' => 35, 'PRO_UNIT_COST' => 36, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, )
     );
 
     /**
@@ -266,6 +272,10 @@ abstract class BaseProcessPeer
 
         $criteria->addSelectColumn(ProcessPeer::PRO_UID);
 
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+
+        $criteria->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
+
         $criteria->addSelectColumn(ProcessPeer::PRO_PARENT);
 
         $criteria->addSelectColumn(ProcessPeer::PRO_TIME);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 6395c2024..48d56ea55 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -870,6 +870,8 @@
       <parameter name="Comment" value="Store process Information"/>
     </vendor>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+    <column name="PRO_TITLE" type="LONGVARCHAR" required="true"/>
+    <column name="PRO_DESCRIPTION" type="LONGVARCHAR"/>
     <column name="PRO_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
     <column name="PRO_TIME" type="DOUBLE" required="true" default="1"/>
     <column name="PRO_TIMEUNIT" type="VARCHAR" size="20" required="true" null="yes" default="DAYS"/>
diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 1b19c9fdf..ee309cb16 100755
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -714,15 +714,7 @@ class Home extends Controller
                 $cProcess = new Criteria("workflow");
                 $cProcess->clearSelectColumns();
                 $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
-                $cProcess->addSelectColumn(ContentPeer::CON_VALUE);
-
-                $del = DBAdapter::getStringDelimiter();
-
-                $conds = array();
-                $conds[] = array(ProcessPeer::PRO_UID,      ContentPeer::CON_ID);
-                $conds[] = array(ContentPeer::CON_CATEGORY, $del . "PRO_TITLE" . $del);
-                $conds[] = array(ContentPeer::CON_LANG,     $del . $lang . $del);
-                $cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
+                $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
                 $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
                 $oDataset = ProcessPeer::doSelectRS($cProcess);
 
@@ -730,7 +722,7 @@ class Home extends Controller
 
                 $oDataset->next();
                 while ($aRow = $oDataset->getRow()) {
-                  $processes[] = array($aRow["PRO_UID"], $aRow["CON_VALUE"]);
+                  $processes[] = array($aRow["PRO_UID"], $aRow["PRO_TITLE"]);
                   $oDataset->next();
                 }
 
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 09d25a82e..1911fdb01 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -418,6 +418,8 @@ DROP TABLE IF EXISTS `PROCESS`;
 CREATE TABLE `PROCESS`
 (
 	`PRO_UID` VARCHAR(32) default '' NOT NULL,
+	`PRO_TITLE` MEDIUMTEXT  NOT NULL,
+	`PRO_DESCRIPTION` MEDIUMTEXT,
 	`PRO_PARENT` VARCHAR(32) default '0' NOT NULL,
 	`PRO_TIME` DOUBLE default 1 NOT NULL,
 	`PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL,
diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
index 13923a430..ba4f399c0 100644
--- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
+++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
@@ -211,22 +211,16 @@ function getProcessArray($action, $userUid)
             $cProcess = new Criteria("workflow");
             $cProcess->clearSelectColumns();
             $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
-            $cProcess->addSelectColumn(ContentPeer::CON_VALUE);
+            $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
 
             $del = DBAdapter::getStringDelimiter();
-
-            $conds = array();
-            $conds[] = array(ProcessPeer::PRO_UID,      ContentPeer::CON_ID);
-            $conds[] = array(ContentPeer::CON_CATEGORY, $del . "PRO_TITLE" . $del);
-            $conds[] = array(ContentPeer::CON_LANG,     $del . $lang . $del);
-            $cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
             $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
             $oDataset = ProcessPeer::doSelectRS($cProcess);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
-                $processes[] = array($aRow["PRO_UID"], $aRow["CON_VALUE"]);
+                $processes[] = array($aRow["PRO_UID"], $aRow["PRO_TITLE"]);
                 $oDataset->next();
             }
 
diff --git a/workflow/engine/methods/cases/casesList_Ajax.php b/workflow/engine/methods/cases/casesList_Ajax.php
index b9e44d389..9b7e4ebea 100755
--- a/workflow/engine/methods/cases/casesList_Ajax.php
+++ b/workflow/engine/methods/cases/casesList_Ajax.php
@@ -131,25 +131,20 @@ if ($actionAjax == "processListExtJs") {
     //get the processes for this user in this action
     $cProcess->clearSelectColumns();
     $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
-    $cProcess->addAsColumn('PRO_TITLE', ContentPeer::CON_VALUE);
+    $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
     if ($categoryUid) {
         $cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid);
     }
 
     $del = \DBAdapter::getStringDelimiter();
-    $conds = array();
-    $conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
-    $conds[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
-    $conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
-    $cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
     $cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
 
     if (!is_null($query)) {
-        $filters = $cProcess->getNewCriterion(ContentPeer::CON_VALUE, '%' . $query . '%', Criteria::LIKE);
+        $filters = $cProcess->getNewCriterion(ProcessPeer::PRO_TITLE, '%' . $query . '%', Criteria::LIKE);
         $cProcess->addAnd($filters);
     }
 
-    $cProcess->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+    $cProcess->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
 
     $oDataset = ProcessPeer::doSelectRS($cProcess);
     $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
diff --git a/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php b/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php
index 9e82b7fb8..7aa278c50 100755
--- a/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php
+++ b/workflow/engine/methods/cases/cases_SchedulerGetProcesses.php
@@ -11,14 +11,11 @@ G::LoadClass( 'Content' );
 $oCriteria = new Criteria( 'workflow' );
 $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
 $oCriteria->setDistinct();
-$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
+$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
 $oCriteria->addJoin( ProcessPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN );
-$oCriteria->addJoin( ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
 $oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN );
 $oCriteria->add( TaskUserPeer::USR_UID, $oUserId );
 $oCriteria->add( TaskPeer::TAS_START, 'true' );
-$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
 $oCriteria->addAnd( ProcessPeer::PRO_UID, $process );
 
 $resultSet = TaskUserPeer::doSelectRS( $oCriteria );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 0a2f35a5c..afe88dcfb 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -2641,6 +2641,7 @@ class Cases
             $c->clearSelectColumns();
             $c->addSelectColumn(\TaskPeer::TAS_UID);
             $c->addSelectColumn(\TaskPeer::PRO_UID);
+            $c->addSelectColumn(\ProcessPeer::PRO_TITLE);
             $c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN);
             $c->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN);
             $c->add(\ProcessPeer::PRO_STATUS, 'ACTIVE');
@@ -2662,20 +2663,6 @@ class Cases
             );
             $c->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
 
-            $c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
-            $c->addAlias("C2", 'CONTENT');
-            $proTitleConds = array();
-            $proTitleConds[] = array(\ProcessPeer::PRO_UID, 'C2.CON_ID');
-            $proTitleConds[] = array(
-                'C2.CON_CATEGORY',
-                \DBAdapter::getStringDelimiter() . 'PRO_TITLE' . \DBAdapter::getStringDelimiter()
-            );
-            $proTitleConds[] = array(
-                'C2.CON_LANG',
-                \DBAdapter::getStringDelimiter() . SYS_LANG . \DBAdapter::getStringDelimiter()
-            );
-            $c->addJoinMC( $proTitleConds, \Criteria::LEFT_JOIN );
-
             if ($typeView == 'category') {
                 $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
                 $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 02f81acab..ec5769162 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -1098,26 +1098,19 @@ class Light
                 $cProcess = new Criteria( 'workflow' );
                 $cProcess->clearSelectColumns();
                 $cProcess->addSelectColumn( \ProcessPeer::PRO_UID );
-                $cProcess->addSelectColumn( \ContentPeer::CON_VALUE );
+                $cProcess->addSelectColumn( \ProcessPeer::PRO_TITLE );
                 if ($categoryUid) {
                     $cProcess->add( \ProcessPeer::PRO_CATEGORY, $categoryUid );
                 }
-                $del = DBAdapter::getStringDelimiter();
-                $conds = array ();
-                $conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID);
-                $conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del);
-                $conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del);
-                $cProcess->addJoinMC( $conds, Criteria::LEFT_JOIN );
                 $cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' );
-                $cProcess->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+                $cProcess->addAscendingOrderByColumn(\ProcessPeer::PRO_TITLE);
 
-                $oDataset = ProcessPeer::doSelectRS( $cProcess );
-                $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                $oDataset = \ProcessPeer::doSelectRS( $cProcess );
+                $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
                 $oDataset->next();
 
                 while ($aRow = $oDataset->getRow()) {
-                    $processes[] = array ($aRow['PRO_UID'],$aRow['CON_VALUE']
-                    );
+                    $processes[] = array ($aRow['PRO_UID'],$aRow['PRO_TITLE']);
                     $oDataset->next();
                 }
                 return print G::json_encode( $processes );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
index 0555055cb..322b23b83 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
@@ -129,20 +129,13 @@ class Process
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\ProcessPeer::PRO_UID);
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\ProcessPeer::PRO_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "PRO_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
+            $criteria->addSelectColumn(\ProcessPeer::PRO_TITLE);
 
             if ($processUidExclude != "") {
                 $criteria->add(\ProcessPeer::PRO_UID, $processUidExclude, \Criteria::NOT_EQUAL);
             }
 
-            $criteria->add("CT.CON_VALUE", $processTitle, \Criteria::EQUAL);
+            $criteria->add(\ProcessPeer::PRO_TITLE, $processTitle, \Criteria::EQUAL);
 
             $rsCriteria = \ProcessPeer::doSelectRS($criteria);
 

From 3cc18d73d757952594117b81f72eae3b7f5c0af2 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Thu, 23 Jun 2016 14:03:56 -0400
Subject: [PATCH 03/16] HOR-1300 Performance Issue in PMFGroupList function

---
 workflow/engine/classes/class.pmFunctions.php | 14 +++---
 workflow/engine/classes/class.wsBase.php      | 49 +++++++++++--------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index eca921f8e..180ba7107 100755
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -1897,20 +1897,20 @@ function PMFGenerateOutputDocument ($outputID, $sApplication = null, $index = nu
  * @label PMF Group List
  * @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFGroupList.28.29
  *
+ * @param string | $search = null | String to search | Optional parameter.
+ * @param int | $start = null | Start | Optional parameter.
+ * @param int | $limit = null | Limit | Optional parameter.
  * @return array | $rows | List of groups | An array of groups
  *
  */
-function PMFGroupList () //its test was successfull
+function PMFGroupList ($search = null, $start = null, $limit = null) //its test was successfull
 {
     G::LoadClass( 'wsBase' );
     $ws = new wsBase();
-    $result = $ws->groupList();
-    $rows = Array ();
-    $i = 1;
+    $result = $ws->groupList($search, $start, $limit);
+    $rows = array();
     if (isset( $result )) {
-        foreach ($result as $item) {
-            $rows[$i ++] = $item;
-        }
+        $rows = array_combine(range(1, count($result)), array_values($result));
     }
     return $rows;
 }
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 1b92381e6..e95fc0a6c 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -229,32 +229,41 @@ class wsBase
     /**
      * get all groups
      *
-     * @param none
-     * @return $result will return an object
+     * @param null $search
+     * @param null $start
+     * @param null $limit
+     * @return array|stdClass
      */
-    public function groupList ()
+    public function groupList($search = null, $start = null, $limit = null)
     {
         try {
-            $result = array ();
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' );
-            $oDataset = GroupwfPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-
-            while ($aRow = $oDataset->getRow()) {
-                $oGroupwf = new Groupwf();
-                $arrayGroupwf = $oGroupwf->Load( $aRow['GRP_UID'] );
-                $result[] = array ('guid' => $aRow['GRP_UID'],'name' => $arrayGroupwf['GRP_TITLE']
-                );
-                $oDataset->next();
+            $criteria = new Criteria('workflow');
+            $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
+            $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
+            $criteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
+            $criteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
+            if ($search) {
+                $criteria->add(GroupwfPeer::GRP_TITLE, $search, Criteria::EQUAL);
+                $criteria->addOr(GroupwfPeer::GRP_TITLE, $search . '%', Criteria::LIKE);
+                $criteria->addOr(GroupwfPeer::GRP_TITLE, '%' . $search, Criteria::LIKE);
+                $criteria->addOr(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
+            }
+            if ($start) {
+                $criteria->setOffset($start);
+            }
+            if ($limit) {
+                $criteria->setLimit($limit);
+            }
+            $rs = GroupwfPeer::doSelectRS($criteria);
+            $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $result = array();
+            while ($rs->next()) {
+                $rows = $rs->getRow();
+                $result[] = array('guid' => $rows['GRP_UID'], 'name' => $rows['GRP_TITLE']);
             }
-
             return $result;
         } catch (Exception $e) {
-            $result[] = array ('guid' => $e->getMessage(),'name' => $e->getMessage()
-            );
-
+            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage());
             return $result;
         }
     }

From 861a566b00c52e0e1c6b74a096b1c660941ef5d2 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Thu, 23 Jun 2016 15:58:54 -0400
Subject: [PATCH 04/16] change search by regex

---
 workflow/engine/classes/class.pmFunctions.php |  6 +++---
 workflow/engine/classes/class.wsBase.php      | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 180ba7107..87993cbb7 100755
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -1897,17 +1897,17 @@ function PMFGenerateOutputDocument ($outputID, $sApplication = null, $index = nu
  * @label PMF Group List
  * @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFGroupList.28.29
  *
- * @param string | $search = null | String to search | Optional parameter.
+ * @param string | $regex = null | String to search | Optional parameter.
  * @param int | $start = null | Start | Optional parameter.
  * @param int | $limit = null | Limit | Optional parameter.
  * @return array | $rows | List of groups | An array of groups
  *
  */
-function PMFGroupList ($search = null, $start = null, $limit = null) //its test was successfull
+function PMFGroupList ($regex = null, $start = null, $limit = null) //its test was successfull
 {
     G::LoadClass( 'wsBase' );
     $ws = new wsBase();
-    $result = $ws->groupList($search, $start, $limit);
+    $result = $ws->groupList($regex, $start, $limit);
     $rows = array();
     if (isset( $result )) {
         $rows = array_combine(range(1, count($result)), array_values($result));
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index e95fc0a6c..b3365ee50 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -230,11 +230,12 @@ class wsBase
      * get all groups
      *
      * @param null $search
+     * @param null $regex
      * @param null $start
      * @param null $limit
      * @return array|stdClass
      */
-    public function groupList($search = null, $start = null, $limit = null)
+    public function groupList($regex = null, $start = null, $limit = null)
     {
         try {
             $criteria = new Criteria('workflow');
@@ -242,11 +243,9 @@ class wsBase
             $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
             $criteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
             $criteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
-            if ($search) {
-                $criteria->add(GroupwfPeer::GRP_TITLE, $search, Criteria::EQUAL);
-                $criteria->addOr(GroupwfPeer::GRP_TITLE, $search . '%', Criteria::LIKE);
-                $criteria->addOr(GroupwfPeer::GRP_TITLE, '%' . $search, Criteria::LIKE);
-                $criteria->addOr(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
+            if ($regex) {
+                $regex = GroupwfPeer::GRP_TITLE . " REGEXP '" . $regex . "'";
+                $criteria->add(GroupwfPeer::GRP_TITLE, $regex, Criteria::CUSTOM);
             }
             if ($start) {
                 $criteria->setOffset($start);

From 5c79eb30da4c52a82fd1db47d57a5b11c89a0518 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Wed, 29 Jun 2016 11:52:56 -0400
Subject: [PATCH 05/16] HOR-1316 Agregar el campo DEPO_TITLE en la tabla
 DEPARTMENT

---
 workflow/engine/classes/class.wsBase.php      |   2 +-
 workflow/engine/classes/model/Department.php  |  49 +++-----
 .../model/map/DepartmentMapBuilder.php        |   2 +
 .../classes/model/om/BaseDepartment.php       | 116 +++++++++++++-----
 .../classes/model/om/BaseDepartmentPeer.php   |  23 ++--
 workflow/engine/config/schema.xml             |   1 +
 workflow/engine/controllers/dashboard.php     |  19 +--
 workflow/engine/data/mysql/schema.sql         |   1 +
 .../methods/departments/departments_Ajax.php  |   8 +-
 .../ProcessMaker/BusinessModel/Department.php |  15 +--
 10 files changed, 130 insertions(+), 106 deletions(-)

diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index b3365ee50..d854e4946 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -287,7 +287,7 @@ class wsBase
                 $oDepartment = new Department();
                 $aDepartment = $oDepartment->Load( $aRow['DEP_UID'] );
                 $node['guid'] = $aRow['DEP_UID'];
-                $node['name'] = $aDepartment['DEPO_TITLE'];
+                $node['name'] = $aDepartment['DEP_TITLE'];
                 $node['parentUID'] = $aDepartment['DEP_PARENT'];
                 $node['dn'] = $aDepartment['DEP_LDAP_DN'];
 
diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php
index 38127f0c3..337410903 100755
--- a/workflow/engine/classes/model/Department.php
+++ b/workflow/engine/classes/model/Department.php
@@ -105,8 +105,10 @@ class Department extends BaseDepartment
 
             if (isset( $aData['DEP_TITLE'] )) {
                 $this->setDepTitle( $aData['DEP_TITLE'] );
+                $this->setDepTitleContent( $aData['DEP_TITLE'] );
             } else {
                 $this->setDepTitle( '' );
+                $this->setDepTitleContent( '' );
             }
 
             if ($this->validate()) {
@@ -138,7 +140,7 @@ class Department extends BaseDepartment
      *
      * @return string
      */
-    public function getDepTitle ()
+    public function getDepTitleContent ()
     {
         if ($this->getDepUid() == '') {
             throw (new Exception( "Error in getDepTitle, the DEP_UID can't be blank" ));
@@ -154,7 +156,7 @@ class Department extends BaseDepartment
      * @param string $v new value
      * @return void
      */
-    public function setDepTitle ($v)
+    public function setDepTitleContent ($v)
     {
         if ($this->getDepUid() == '') {
             throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" ));
@@ -188,7 +190,7 @@ class Department extends BaseDepartment
             if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
                 $aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME );
                 $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
-                $aFields['DEPO_TITLE'] = $oDept->getDepTitle();
+                //$aFields['DEPO_TITLE'] = $oDept->getDepTitle();
                 return $aFields;
             } else {
                 throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" ));
@@ -217,6 +219,7 @@ class Department extends BaseDepartment
                 if ($oPro->validate()) {
                     if (isset( $aData['DEPO_TITLE'] )) {
                         $oPro->setDepTitle( $aData['DEPO_TITLE'] );
+                        $oPro->setDepTitleContent( $aData['DEPO_TITLE'] );
                     }
                     if (isset( $aData['DEP_STATUS'] )) {
                         $oPro->setDepStatus( $aData['DEP_STATUS'] );
@@ -371,7 +374,7 @@ class Department extends BaseDepartment
             $user = $oUser->loadDetailed ($managerId);
             if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
                 $dptoTitle = $oDept->Load($depId);
-                G::auditLog("AssignManagerToDepartament", "Assign Manager ".$user['USR_USERNAME']." (".$managerId.") to ".$dptoTitle['DEPO_TITLE']." (".$depId.") ");
+                G::auditLog("AssignManagerToDepartament", "Assign Manager ".$user['USR_USERNAME']." (".$managerId.") to ".$dptoTitle['DEP_TITLE']." (".$depId.") ");
             }
         }
         // get children departments to update the reportsTo of these children
@@ -403,7 +406,7 @@ class Department extends BaseDepartment
             if (is_object( $oUser ) && get_class( $oUser ) == 'Users') {
                 $oUser->setDepUid( $depId );
                 $oUser->save();
-                G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEPO_TITLE']." (".$depId.") ");
+                G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEP_TITLE']." (".$depId.") ");
             }
 
             //if the user is a manager update Department Table
@@ -496,14 +499,10 @@ class Department extends BaseDepartment
         $oCriteria = new Criteria( 'workflow' );
 
         $oCriteria->clearSelectColumns();
-        $oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
-        $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
         $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
-        $oCriteria->addJoin( ContentPeer::CON_ID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ContentPeer::CON_VALUE, $departmentName );
+        $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
+        $oCriteria->add( DepartmentPeer::DEP_TITLE, $departmentName );
         $oCriteria->add( DepartmentPeer::DEP_UID, $departmentUID, Criteria::NOT_EQUAL );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
         $oCriteria->add( DepartmentPeer::DEP_PARENT, $parentUID );
 
         $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
@@ -585,7 +584,7 @@ class Department extends BaseDepartment
                 $oUser->setUsrReportsTo( '' );
                 $oUser->save();
 
-                G::auditLog("RemoveUsersFromDepartament", "Remove user ".$user['USR_USERNAME']."( ".$UsrUid.") from departament ".$dptoTitle['DEPO_TITLE']." (".$DepUid.") ");
+                G::auditLog("RemoveUsersFromDepartament", "Remove user ".$user['USR_USERNAME']."( ".$UsrUid.") from departament ".$dptoTitle['DEP_TITLE']." (".$DepUid.") ");
             }
         } catch (exception $oError) {
             throw ($oError);
@@ -641,12 +640,8 @@ class Department extends BaseDepartment
         $del = DBAdapter::getStringDelimiter();
 
         $c->clearSelectColumns();
-        $c->addSelectColumn( ContentPeer::CON_CATEGORY );
-        $c->addSelectColumn( ContentPeer::CON_VALUE );
-
-        $c->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
-        $c->add( ContentPeer::CON_VALUE, $Groupname );
-        $c->add( ContentPeer::CON_LANG, SYS_LANG );
+        $c->addSelectColumn(DepartmentPeer::DEP_TITLE);
+        $c->add(DepartmentPeer::DEP_TITLE, $Groupname);
         return $c;
     }
 
@@ -655,10 +650,8 @@ class Department extends BaseDepartment
     {
         $c = new Criteria( 'workflow' );
         $c->addSelectColumn( UsersPeer::USR_UID );
-        $c->addAsColumn( 'DEP_TITLE', ContentPeer::CON_VALUE );
-        $c->add( ContentPeer::CON_LANG, defined( SYS_LANG ) ? SYS_LANG : 'en' );
-        $c->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
-        $c->addJoin( UsersPeer::DEP_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN );
+        $c->addSelectColumn( DepartmentPeer::DEP_TITLE );
+        $c->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::INNER_JOIN );
         $Dat = UsersPeer::doSelectRS( $c );
         $Dat->setFetchmode( ResultSet::FETCHMODE_ASSOC );
         $aRows = Array ();
@@ -673,18 +666,8 @@ class Department extends BaseDepartment
     {
         $criteria = new Criteria( 'workflow' );
         $criteria->addSelectColumn( UsersPeer::DEP_UID );
-        $criteria->addAsColumn( 'DEP_TITLE', 'C.CON_VALUE' );
-        $criteria->addAlias( 'C', 'CONTENT' );
+        $criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
         $criteria->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN );
-        $delimiter = DBAdapter::getStringDelimiter();
-        $conditions = array ();
-        $conditions[] = array (DepartmentPeer::DEP_UID,'C.CON_ID'
-        );
-        $conditions[] = array ('C.CON_CATEGORY',$delimiter . 'DEPO_TITLE' . $delimiter
-        );
-        $conditions[] = array ('C.CON_LANG',$delimiter . SYS_LANG . $delimiter
-        );
-        $criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
         $criteria->add( UsersPeer::USR_UID, $userUid );
         $criteria->add( UsersPeer::DEP_UID, '', Criteria::NOT_EQUAL );
         $dataset = DepartmentPeer::doSelectRS( $criteria );
diff --git a/workflow/engine/classes/model/map/DepartmentMapBuilder.php b/workflow/engine/classes/model/map/DepartmentMapBuilder.php
index c6dd74b92..07e6c1bfe 100755
--- a/workflow/engine/classes/model/map/DepartmentMapBuilder.php
+++ b/workflow/engine/classes/model/map/DepartmentMapBuilder.php
@@ -67,6 +67,8 @@ class DepartmentMapBuilder
 
         $tMap->addPrimaryKey('DEP_UID', 'DepUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('DEP_TITLE', 'DepTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
         $tMap->addColumn('DEP_PARENT', 'DepParent', 'string', CreoleTypes::VARCHAR, true, 32);
 
         $tMap->addColumn('DEP_MANAGER', 'DepManager', 'string', CreoleTypes::VARCHAR, true, 32);
diff --git a/workflow/engine/classes/model/om/BaseDepartment.php b/workflow/engine/classes/model/om/BaseDepartment.php
index 35e7b4b57..10fe5a57d 100755
--- a/workflow/engine/classes/model/om/BaseDepartment.php
+++ b/workflow/engine/classes/model/om/BaseDepartment.php
@@ -33,6 +33,12 @@ abstract class BaseDepartment extends BaseObject implements Persistent
      */
     protected $dep_uid = '';
 
+    /**
+     * The value for the dep_title field.
+     * @var        string
+     */
+    protected $dep_title;
+
     /**
      * The value for the dep_parent field.
      * @var        string
@@ -94,6 +100,17 @@ abstract class BaseDepartment extends BaseObject implements Persistent
         return $this->dep_uid;
     }
 
+    /**
+     * Get the [dep_title] column value.
+     * 
+     * @return     string
+     */
+    public function getDepTitle()
+    {
+
+        return $this->dep_title;
+    }
+
     /**
      * Get the [dep_parent] column value.
      * 
@@ -182,6 +199,28 @@ abstract class BaseDepartment extends BaseObject implements Persistent
 
     } // setDepUid()
 
+    /**
+     * Set the value of [dep_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setDepTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->dep_title !== $v) {
+            $this->dep_title = $v;
+            $this->modifiedColumns[] = DepartmentPeer::DEP_TITLE;
+        }
+
+    } // setDepTitle()
+
     /**
      * Set the value of [dep_parent] column.
      * 
@@ -333,24 +372,26 @@ abstract class BaseDepartment extends BaseObject implements Persistent
 
             $this->dep_uid = $rs->getString($startcol + 0);
 
-            $this->dep_parent = $rs->getString($startcol + 1);
+            $this->dep_title = $rs->getString($startcol + 1);
 
-            $this->dep_manager = $rs->getString($startcol + 2);
+            $this->dep_parent = $rs->getString($startcol + 2);
 
-            $this->dep_location = $rs->getInt($startcol + 3);
+            $this->dep_manager = $rs->getString($startcol + 3);
 
-            $this->dep_status = $rs->getString($startcol + 4);
+            $this->dep_location = $rs->getInt($startcol + 4);
 
-            $this->dep_ref_code = $rs->getString($startcol + 5);
+            $this->dep_status = $rs->getString($startcol + 5);
 
-            $this->dep_ldap_dn = $rs->getString($startcol + 6);
+            $this->dep_ref_code = $rs->getString($startcol + 6);
+
+            $this->dep_ldap_dn = $rs->getString($startcol + 7);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 7; // 7 = DepartmentPeer::NUM_COLUMNS - DepartmentPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 8; // 8 = DepartmentPeer::NUM_COLUMNS - DepartmentPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Department object", $e);
@@ -558,21 +599,24 @@ abstract class BaseDepartment extends BaseObject implements Persistent
                 return $this->getDepUid();
                 break;
             case 1:
-                return $this->getDepParent();
+                return $this->getDepTitle();
                 break;
             case 2:
-                return $this->getDepManager();
+                return $this->getDepParent();
                 break;
             case 3:
-                return $this->getDepLocation();
+                return $this->getDepManager();
                 break;
             case 4:
-                return $this->getDepStatus();
+                return $this->getDepLocation();
                 break;
             case 5:
-                return $this->getDepRefCode();
+                return $this->getDepStatus();
                 break;
             case 6:
+                return $this->getDepRefCode();
+                break;
+            case 7:
                 return $this->getDepLdapDn();
                 break;
             default:
@@ -596,12 +640,13 @@ abstract class BaseDepartment extends BaseObject implements Persistent
         $keys = DepartmentPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getDepUid(),
-            $keys[1] => $this->getDepParent(),
-            $keys[2] => $this->getDepManager(),
-            $keys[3] => $this->getDepLocation(),
-            $keys[4] => $this->getDepStatus(),
-            $keys[5] => $this->getDepRefCode(),
-            $keys[6] => $this->getDepLdapDn(),
+            $keys[1] => $this->getDepTitle(),
+            $keys[2] => $this->getDepParent(),
+            $keys[3] => $this->getDepManager(),
+            $keys[4] => $this->getDepLocation(),
+            $keys[5] => $this->getDepStatus(),
+            $keys[6] => $this->getDepRefCode(),
+            $keys[7] => $this->getDepLdapDn(),
         );
         return $result;
     }
@@ -637,21 +682,24 @@ abstract class BaseDepartment extends BaseObject implements Persistent
                 $this->setDepUid($value);
                 break;
             case 1:
-                $this->setDepParent($value);
+                $this->setDepTitle($value);
                 break;
             case 2:
-                $this->setDepManager($value);
+                $this->setDepParent($value);
                 break;
             case 3:
-                $this->setDepLocation($value);
+                $this->setDepManager($value);
                 break;
             case 4:
-                $this->setDepStatus($value);
+                $this->setDepLocation($value);
                 break;
             case 5:
-                $this->setDepRefCode($value);
+                $this->setDepStatus($value);
                 break;
             case 6:
+                $this->setDepRefCode($value);
+                break;
+            case 7:
                 $this->setDepLdapDn($value);
                 break;
         } // switch()
@@ -682,27 +730,31 @@ abstract class BaseDepartment extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setDepParent($arr[$keys[1]]);
+            $this->setDepTitle($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setDepManager($arr[$keys[2]]);
+            $this->setDepParent($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setDepLocation($arr[$keys[3]]);
+            $this->setDepManager($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setDepStatus($arr[$keys[4]]);
+            $this->setDepLocation($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setDepRefCode($arr[$keys[5]]);
+            $this->setDepStatus($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setDepLdapDn($arr[$keys[6]]);
+            $this->setDepRefCode($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setDepLdapDn($arr[$keys[7]]);
         }
 
     }
@@ -720,6 +772,10 @@ abstract class BaseDepartment extends BaseObject implements Persistent
             $criteria->add(DepartmentPeer::DEP_UID, $this->dep_uid);
         }
 
+        if ($this->isColumnModified(DepartmentPeer::DEP_TITLE)) {
+            $criteria->add(DepartmentPeer::DEP_TITLE, $this->dep_title);
+        }
+
         if ($this->isColumnModified(DepartmentPeer::DEP_PARENT)) {
             $criteria->add(DepartmentPeer::DEP_PARENT, $this->dep_parent);
         }
@@ -798,6 +854,8 @@ abstract class BaseDepartment extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setDepTitle($this->dep_title);
+
         $copyObj->setDepParent($this->dep_parent);
 
         $copyObj->setDepManager($this->dep_manager);
diff --git a/workflow/engine/classes/model/om/BaseDepartmentPeer.php b/workflow/engine/classes/model/om/BaseDepartmentPeer.php
index 3f37d54d1..7e3deefde 100755
--- a/workflow/engine/classes/model/om/BaseDepartmentPeer.php
+++ b/workflow/engine/classes/model/om/BaseDepartmentPeer.php
@@ -25,7 +25,7 @@ abstract class BaseDepartmentPeer
     const CLASS_DEFAULT = 'classes.model.Department';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 8;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseDepartmentPeer
     /** the column name for the DEP_UID field */
     const DEP_UID = 'DEPARTMENT.DEP_UID';
 
+    /** the column name for the DEP_TITLE field */
+    const DEP_TITLE = 'DEPARTMENT.DEP_TITLE';
+
     /** the column name for the DEP_PARENT field */
     const DEP_PARENT = 'DEPARTMENT.DEP_PARENT';
 
@@ -63,10 +66,10 @@ abstract class BaseDepartmentPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('DepUid', 'DepParent', 'DepManager', 'DepLocation', 'DepStatus', 'DepRefCode', 'DepLdapDn', ),
-        BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID, DepartmentPeer::DEP_PARENT, DepartmentPeer::DEP_MANAGER, DepartmentPeer::DEP_LOCATION, DepartmentPeer::DEP_STATUS, DepartmentPeer::DEP_REF_CODE, DepartmentPeer::DEP_LDAP_DN, ),
-        BasePeer::TYPE_FIELDNAME => array ('DEP_UID', 'DEP_PARENT', 'DEP_MANAGER', 'DEP_LOCATION', 'DEP_STATUS', 'DEP_REF_CODE', 'DEP_LDAP_DN', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+        BasePeer::TYPE_PHPNAME => array ('DepUid', 'DepTitle', 'DepParent', 'DepManager', 'DepLocation', 'DepStatus', 'DepRefCode', 'DepLdapDn', ),
+        BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID, DepartmentPeer::DEP_TITLE, DepartmentPeer::DEP_PARENT, DepartmentPeer::DEP_MANAGER, DepartmentPeer::DEP_LOCATION, DepartmentPeer::DEP_STATUS, DepartmentPeer::DEP_REF_CODE, DepartmentPeer::DEP_LDAP_DN, ),
+        BasePeer::TYPE_FIELDNAME => array ('DEP_UID', 'DEP_TITLE', 'DEP_PARENT', 'DEP_MANAGER', 'DEP_LOCATION', 'DEP_STATUS', 'DEP_REF_CODE', 'DEP_LDAP_DN', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -76,10 +79,10 @@ abstract class BaseDepartmentPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('DepUid' => 0, 'DepParent' => 1, 'DepManager' => 2, 'DepLocation' => 3, 'DepStatus' => 4, 'DepRefCode' => 5, 'DepLdapDn' => 6, ),
-        BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID => 0, DepartmentPeer::DEP_PARENT => 1, DepartmentPeer::DEP_MANAGER => 2, DepartmentPeer::DEP_LOCATION => 3, DepartmentPeer::DEP_STATUS => 4, DepartmentPeer::DEP_REF_CODE => 5, DepartmentPeer::DEP_LDAP_DN => 6, ),
-        BasePeer::TYPE_FIELDNAME => array ('DEP_UID' => 0, 'DEP_PARENT' => 1, 'DEP_MANAGER' => 2, 'DEP_LOCATION' => 3, 'DEP_STATUS' => 4, 'DEP_REF_CODE' => 5, 'DEP_LDAP_DN' => 6, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+        BasePeer::TYPE_PHPNAME => array ('DepUid' => 0, 'DepTitle' => 1, 'DepParent' => 2, 'DepManager' => 3, 'DepLocation' => 4, 'DepStatus' => 5, 'DepRefCode' => 6, 'DepLdapDn' => 7, ),
+        BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID => 0, DepartmentPeer::DEP_TITLE => 1, DepartmentPeer::DEP_PARENT => 2, DepartmentPeer::DEP_MANAGER => 3, DepartmentPeer::DEP_LOCATION => 4, DepartmentPeer::DEP_STATUS => 5, DepartmentPeer::DEP_REF_CODE => 6, DepartmentPeer::DEP_LDAP_DN => 7, ),
+        BasePeer::TYPE_FIELDNAME => array ('DEP_UID' => 0, 'DEP_TITLE' => 1, 'DEP_PARENT' => 2, 'DEP_MANAGER' => 3, 'DEP_LOCATION' => 4, 'DEP_STATUS' => 5, 'DEP_REF_CODE' => 6, 'DEP_LDAP_DN' => 7, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -182,6 +185,8 @@ abstract class BaseDepartmentPeer
 
         $criteria->addSelectColumn(DepartmentPeer::DEP_UID);
 
+        $criteria->addSelectColumn(DepartmentPeer::DEP_TITLE);
+
         $criteria->addSelectColumn(DepartmentPeer::DEP_PARENT);
 
         $criteria->addSelectColumn(DepartmentPeer::DEP_MANAGER);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 07724680b..be370f8e9 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -436,6 +436,7 @@
       <parameter name="Comment" value="Departments"/>
     </vendor>
     <column name="DEP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+    <column name="DEP_TITLE" type="LONGVARCHAR" required="true"/>
     <column name="DEP_PARENT" type="VARCHAR" size="32" required="true" default=""/>
     <column name="DEP_MANAGER" type="VARCHAR" size="32" required="true" default=""/>
     <column name="DEP_LOCATION" type="INTEGER" required="true" default="0"/>
diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index a4c233d16..021388031 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -354,27 +354,14 @@ class Dashboard extends Controller
                     $criteria = new Criteria( 'workflow' );
                     $criteria->setDistinct();
                     $criteria->addSelectColumn( DepartmentPeer::DEP_UID );
-                    $criteria->addSelectColumn( ContentPeer::CON_VALUE );
-                    //FROM
-                    $conditions = array ();
-                    $conditions[] = array (DepartmentPeer::DEP_UID,ContentPeer::CON_ID
-                    );
-                    $conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'DEPO_TITLE' . DBAdapter::getStringDelimiter()
-                    );
-                    $conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
-                    );
-                    $criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
-                    //WHERE
+                    $criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
                     $criteria->add( DepartmentPeer::DEP_STATUS, 'ACTIVE' );
-                    //ORDER BY
-                    $criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
-
+                    $criteria->addAscendingOrderByColumn( DepartmentPeer::DEP_TITLE );
                     $dataset = DepartmentPeer::doSelectRS( $criteria );
                     $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
                     $dataset->next();
                     while ($row = $dataset->getRow()) {
-                        $departments[] = array ('OWNER_UID' => $row['DEP_UID'],'OWNER_NAME' => $row['CON_VALUE']
-                        );
+                        $departments[] = array('OWNER_UID' => $row['DEP_UID'], 'OWNER_NAME' => $row['DEP_TITLE']);
                         $dataset->next();
                     }
 
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 30681a5c0..a726e4fb4 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -205,6 +205,7 @@ DROP TABLE IF EXISTS `DEPARTMENT`;
 CREATE TABLE `DEPARTMENT`
 (
 	`DEP_UID` VARCHAR(32) default '' NOT NULL,
+	`DEP_TITLE` MEDIUMTEXT  NOT NULL,
 	`DEP_PARENT` VARCHAR(32) default '' NOT NULL,
 	`DEP_MANAGER` VARCHAR(32) default '' NOT NULL,
 	`DEP_LOCATION` INTEGER default 0 NOT NULL,
diff --git a/workflow/engine/methods/departments/departments_Ajax.php b/workflow/engine/methods/departments/departments_Ajax.php
index 0be601615..4f85a4672 100755
--- a/workflow/engine/methods/departments/departments_Ajax.php
+++ b/workflow/engine/methods/departments/departments_Ajax.php
@@ -153,13 +153,9 @@ switch ($_POST['action']) {
         $oCriteria = new Criteria( 'workflow' );
 
         $oCriteria->clearSelectColumns();
-        $oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
-        $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
         $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
-        $oCriteria->addJoin( ContentPeer::CON_ID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ContentPeer::CON_VALUE, $dep_name );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
+        $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
+        $oCriteria->add( DepartmentPeer::DEP_TITLE, $dep_name );
         $oCriteria->add( DepartmentPeer::DEP_PARENT, $parent );
 
         $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Department.php b/workflow/engine/src/ProcessMaker/BusinessModel/Department.php
index 99052dc26..080de4542 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Department.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Department.php
@@ -22,25 +22,16 @@ class Department
     public function existsTitle($departmentTitle, $departmentUidExclude = "")
     {
         try {
-            $delimiter = \DBAdapter::getStringDelimiter();
-
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\DepartmentPeer::DEP_UID);
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\DepartmentPeer::DEP_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DEPO_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
+            $criteria->addSelectColumn(\DepartmentPeer::DEP_TITLE);
 
             if ($departmentUidExclude != "") {
                 $criteria->add(\DepartmentPeer::DEP_UID, $departmentUidExclude, \Criteria::NOT_EQUAL);
             }
 
-            $criteria->add("CT.CON_VALUE", $departmentTitle, \Criteria::EQUAL);
+            $criteria->add(\DepartmentPeer::DEP_TITLE, $departmentTitle, \Criteria::EQUAL);
 
             $rsCriteria = \DepartmentPeer::doSelectRS($criteria);
 
@@ -476,7 +467,7 @@ class Department
         $oDept->updateDepartmentManager( $dep_uid );
 
         $oDept = new \Department();
-        $oDept->load($dep_uid);
+        $oDept->Load($dep_uid);
         $oDept->addUserToDepartment($dep_uid, $usr_uid, ($oDept->getDepManager() == "")? true : false, false);
         $oDept->updateDepartmentManager($dep_uid);
     }

From 6a82ca3e96425c63cc610b0ca0d8ee3705990735 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Wed, 29 Jun 2016 12:07:16 -0400
Subject: [PATCH 06/16] remove DEPO_TITLE

---
 workflow/engine/classes/class.pmDashlet.php   |  2 +-
 workflow/engine/classes/model/Department.php  |  3 +-
 .../methods/departments/departments_Ajax.php  |  4 +--
 workflow/engine/methods/users/myInfo_Edit.php |  8 ++---
 workflow/engine/methods/users/users_Edit.php  | 34 +++++++++----------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/workflow/engine/classes/class.pmDashlet.php b/workflow/engine/classes/class.pmDashlet.php
index 853b053b0..f26ea6560 100644
--- a/workflow/engine/classes/class.pmDashlet.php
+++ b/workflow/engine/classes/class.pmDashlet.php
@@ -132,7 +132,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
                         $departmentInstance = new Department();
                         try {
                             $department = $departmentInstance->load( $row['DAS_INS_OWNER_UID'] );
-                            $row['DAS_INS_OWNER_TITLE'] = $department['DEPO_TITLE'];
+                            $row['DAS_INS_OWNER_TITLE'] = $department['DEP_TITLE'];
                         } catch (Exception $error) {
                             $this->remove( $row['DAS_INS_UID'] );
                             $row['DAS_INS_UID'] = '';
diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php
index 337410903..2661f00b4 100755
--- a/workflow/engine/classes/model/Department.php
+++ b/workflow/engine/classes/model/Department.php
@@ -190,7 +190,6 @@ class Department extends BaseDepartment
             if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
                 $aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME );
                 $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
-                //$aFields['DEPO_TITLE'] = $oDept->getDepTitle();
                 return $aFields;
             } else {
                 throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" ));
@@ -293,7 +292,7 @@ class Department extends BaseDepartment
                 Content::removeContent( 'DEPO_TITLE', '', $oPro->getDepUid() );
                 Content::removeContent( 'DEPO_DESCRIPTION', '', $oPro->getDepUid() );
 
-                G::auditLog("DeleteDepartament", "Departament Name: ".$dptoTitle['DEPO_TITLE']." Departament ID: (".$oPro->getDepUid().") ");
+                G::auditLog("DeleteDepartament", "Departament Name: ".$dptoTitle['DEP_TITLE']." Departament ID: (".$oPro->getDepUid().") ");
                 return $oPro->delete();
             } else {
                 throw (new Exception( "The row '$ProUid' in table Group doesn't exist!" ));
diff --git a/workflow/engine/methods/departments/departments_Ajax.php b/workflow/engine/methods/departments/departments_Ajax.php
index 4f85a4672..52e8921c7 100755
--- a/workflow/engine/methods/departments/departments_Ajax.php
+++ b/workflow/engine/methods/departments/departments_Ajax.php
@@ -72,7 +72,7 @@ switch ($_POST['action']) {
     case 'showUsers':
         global $G_PUBLISH;
         $oDept = new Department();
-        $aFields = $oDept->load( $_POST['sDptoUID'] );
+        $aFields = $oDept->Load( $_POST['sDptoUID'] );
         $G_PUBLISH = new Publisher();
         $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'departments/departments_Edit', '', $aFields, '' );
 
@@ -82,7 +82,7 @@ switch ($_POST['action']) {
         //$G_PUBLISH->AddContent('propeltable', 'paged-table', 'departments/departments_UsersList', $criteria, $aFields);
 
         $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptCode( "groupname='{$aFields["DEPO_TITLE"]}';" );
+        $oHeadPublisher->addScriptCode( "groupname='{$aFields["DEP_TITLE"]}';" );
         $oHeadPublisher->addScriptCode( "depUid='{$aFields["DEP_UID"]}';" );
 
         G::RenderPage( 'publish', 'raw' );
diff --git a/workflow/engine/methods/users/myInfo_Edit.php b/workflow/engine/methods/users/myInfo_Edit.php
index e087ea4ed..e52b6b553 100755
--- a/workflow/engine/methods/users/myInfo_Edit.php
+++ b/workflow/engine/methods/users/myInfo_Edit.php
@@ -55,8 +55,8 @@ try {
         $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
         $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
         try {
-            $depFields = $oDepInfo->load( $userFields['DEP_UID'] . 'xy<' );
-            $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")";
+            $depFields = $oDepInfo->Load( $userFields['DEP_UID'] . 'xy<' );
+            $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
         } catch (Exception $e) {
         }
     } else {
@@ -64,8 +64,8 @@ try {
     }
 
     try {
-        $depFields = $oDepInfo->load( $aFields['DEP_UID'] );
-        $aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
+        $depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
+        $aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
     } catch (Exception $e) {
         $oUser = UsersPeer::retrieveByPk( $_SESSION['USER_LOGGED'] );
         $oUser->setDepUid( '' );
diff --git a/workflow/engine/methods/users/users_Edit.php b/workflow/engine/methods/users/users_Edit.php
index c08531f87..3cbe82b0c 100755
--- a/workflow/engine/methods/users/users_Edit.php
+++ b/workflow/engine/methods/users/users_Edit.php
@@ -25,8 +25,8 @@ try {
     global $RBAC;
     $RBAC->requirePermissions( 'PM_USERS' );
 
-    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
-    // the use of the external xmlfield_Image is highly discouraged
+    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
+    // the use of the external xmlfield_Image is highly discouraged
     if (! class_exists( 'XmlForm_Field_Image' )) {
         G::LoadClass( 'xmlfield_Image' );
     }
@@ -54,7 +54,7 @@ try {
 
     $G_PUBLISH = new Publisher();
 
-    //getting the user and department
+    //getting the user and department
     $oDepInfo = new Department();
     $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
     if ($oUser != '')
@@ -62,8 +62,8 @@ try {
             $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
             $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
             try {
-                $depFields = $oDepInfo->load( $userFields['DEP_UID'] );
-                $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")";
+                $depFields = $oDepInfo->Load( $userFields['DEP_UID'] );
+                $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
             } catch (Exception $e) {
             }
         } else {
@@ -71,15 +71,15 @@ try {
         }
 
     try {
-        $depFields = $oDepInfo->load( $aFields['DEP_UID'] );
-        $aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
+        $depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
+        $aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
     } catch (Exception $e) {
         $oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
         $oUser->setDepUid( '' );
         $oUser->save();
     }
 
-    //Load Calendar options and falue for this user
+    //Load Calendar options and falue for this user
     G::LoadClass( 'calendar' );
     $calendar = new Calendar();
     $calendarObj = $calendar->getCalendarList( true, true );
@@ -87,12 +87,12 @@ try {
     $_DBArray['availableCalendars'] = $calendarObj['array'];
     $_SESSION['_DBArray'] = $_DBArray;
     $calendarInfo = $calendar->getCalendarFor( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] );
-    //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
+    //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
     $aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
     $aFields['RANDOM'] = rand();
 
-    /////////////////////////
-    //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
+    /////////////////////////
+    //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
     require_once 'classes/model/Users.php';
     $oCriteria = new Criteria();
     $oCriteria->addSelectColumn( UsersPeer::USR_UID );
@@ -104,7 +104,7 @@ try {
     $oCriteria->add( UsersPeer::USR_UID, $_GET['USR_UID'], Criteria::NOT_EQUAL );
     $oDataset = UsersPeer::doSelectRS( $oCriteria );
     $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-    ///////////////////////
+    ///////////////////////
     G::loadClass( 'configuration' );
     $oConf = new Configurations();
     $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
@@ -122,7 +122,7 @@ try {
         );
     }
 
-    //calculating the max upload file size;
+    //calculating the max upload file size;
     $POST_MAX_SIZE = ini_get( 'post_max_size' );
     $mul = substr( $POST_MAX_SIZE, - 1 );
     $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
@@ -141,15 +141,15 @@ try {
     $_DBArray['aUserInfo'] = $aUserInfo;
     $_SESSION['_DBArray'] = $_DBArray;
     if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') {
-        //always show this form  users_EditRT.xml.
+        //always show this form  users_EditRT.xml.
         $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
     } else {
-        //for users ldap always show this form users_EditLDAP.xml.
+        //for users ldap always show this form users_EditLDAP.xml.
         $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
     }
 
     G::RenderPage( 'publish', 'blank' );
 } catch (Exception $oException) {
     die( $oException->getMessage() );
-}
-
+}
+

From 01b9f8760f8079f094b28f0b01f1581f1ecd268b Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Wed, 29 Jun 2016 12:13:11 -0400
Subject: [PATCH 07/16] LF

---
 workflow/engine/methods/users/users_Edit.php | 310 +++++++++----------
 1 file changed, 155 insertions(+), 155 deletions(-)

diff --git a/workflow/engine/methods/users/users_Edit.php b/workflow/engine/methods/users/users_Edit.php
index 3cbe82b0c..808b8dbaf 100755
--- a/workflow/engine/methods/users/users_Edit.php
+++ b/workflow/engine/methods/users/users_Edit.php
@@ -1,155 +1,155 @@
-<?php
-/**
- * users_Edit.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-try {
-    global $RBAC;
-    $RBAC->requirePermissions( 'PM_USERS' );
-
-    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
-    // the use of the external xmlfield_Image is highly discouraged
-    if (! class_exists( 'XmlForm_Field_Image' )) {
-        G::LoadClass( 'xmlfield_Image' );
-    }
-    require_once 'classes/model/Users.php';
-    require_once 'classes/model/Department.php';
-
-    $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
-    $oUser = new Users();
-    $aFields = $oUser->load( $_GET['USR_UID'] );
-    $aFields['USR_PASSWORD'] = '********';
-    $aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!';
-    $aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) );
-    $aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) );
-    $aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) );
-    $aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) );
-    $aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) );
-    $aFields['MESSAGE6'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) );
-    $aFields['START_DATE'] = date( 'Y-m-d' );
-    $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
-
-    $G_MAIN_MENU = 'processmaker';
-    $G_SUB_MENU = 'users';
-    $G_ID_MENU_SELECTED = 'USERS';
-    $G_ID_SUB_MENU_SELECTED = 'USERS';
-
-    $G_PUBLISH = new Publisher();
-
-    //getting the user and department
-    $oDepInfo = new Department();
-    $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
-    if ($oUser != '')
-        if (get_class( $oUser ) == 'Users') {
-            $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
-            $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
-            try {
-                $depFields = $oDepInfo->Load( $userFields['DEP_UID'] );
-                $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
-            } catch (Exception $e) {
-            }
-        } else {
-            $aFields['USR_REPORTS_TO'] = ' ';
-        }
-
-    try {
-        $depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
-        $aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
-    } catch (Exception $e) {
-        $oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
-        $oUser->setDepUid( '' );
-        $oUser->save();
-    }
-
-    //Load Calendar options and falue for this user
-    G::LoadClass( 'calendar' );
-    $calendar = new Calendar();
-    $calendarObj = $calendar->getCalendarList( true, true );
-    global $_DBArray;
-    $_DBArray['availableCalendars'] = $calendarObj['array'];
-    $_SESSION['_DBArray'] = $_DBArray;
-    $calendarInfo = $calendar->getCalendarFor( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] );
-    //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
-    $aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
-    $aFields['RANDOM'] = rand();
-
-    /////////////////////////
-    //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
-    require_once 'classes/model/Users.php';
-    $oCriteria = new Criteria();
-    $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-    $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-    $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-    $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-    $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
-    $oCriteria->add( UsersPeer::USR_STATUS, 'ACTIVE' );
-    $oCriteria->add( UsersPeer::USR_UID, $_GET['USR_UID'], Criteria::NOT_EQUAL );
-    $oDataset = UsersPeer::doSelectRS( $oCriteria );
-    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-    ///////////////////////
-    G::loadClass( 'configuration' );
-    $oConf = new Configurations();
-    $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
-
-    $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
-
-    $aUserInfo = array ();
-    $aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char'
-    );
-    while ($oDataset->next()) {
-        $aRow1 = $oDataset->getRow();
-
-        $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
-        $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
-        );
-    }
-
-    //calculating the max upload file size;
-    $POST_MAX_SIZE = ini_get( 'post_max_size' );
-    $mul = substr( $POST_MAX_SIZE, - 1 );
-    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-    $postMaxSize = (int) $POST_MAX_SIZE * $mul;
-
-    $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
-    $mul = substr( $UPLOAD_MAX_SIZE, - 1 );
-    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-    $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
-
-    if ($postMaxSize < $uploadMaxSize)
-        $uploadMaxSize = $postMaxSize;
-    $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
-
-    global $_DBArray;
-    $_DBArray['aUserInfo'] = $aUserInfo;
-    $_SESSION['_DBArray'] = $_DBArray;
-    if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') {
-        //always show this form  users_EditRT.xml.
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
-    } else {
-        //for users ldap always show this form users_EditLDAP.xml.
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
-    }
-
-    G::RenderPage( 'publish', 'blank' );
-} catch (Exception $oException) {
-    die( $oException->getMessage() );
-}
-
+<?php
+/**
+ * users_Edit.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+try {
+    global $RBAC;
+    $RBAC->requirePermissions( 'PM_USERS' );
+
+    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
+    // the use of the external xmlfield_Image is highly discouraged
+    if (! class_exists( 'XmlForm_Field_Image' )) {
+        G::LoadClass( 'xmlfield_Image' );
+    }
+    require_once 'classes/model/Users.php';
+    require_once 'classes/model/Department.php';
+
+    $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
+    $oUser = new Users();
+    $aFields = $oUser->load( $_GET['USR_UID'] );
+    $aFields['USR_PASSWORD'] = '********';
+    $aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!';
+    $aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) );
+    $aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) );
+    $aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) );
+    $aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) );
+    $aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) );
+    $aFields['MESSAGE6'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) );
+    $aFields['START_DATE'] = date( 'Y-m-d' );
+    $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
+
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'users';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_ID_SUB_MENU_SELECTED = 'USERS';
+
+    $G_PUBLISH = new Publisher();
+
+    //getting the user and department
+    $oDepInfo = new Department();
+    $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
+    if ($oUser != '')
+        if (get_class( $oUser ) == 'Users') {
+            $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
+            $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
+            try {
+                $depFields = $oDepInfo->Load( $userFields['DEP_UID'] );
+                $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEP_TITLE'] . ")";
+            } catch (Exception $e) {
+            }
+        } else {
+            $aFields['USR_REPORTS_TO'] = ' ';
+        }
+
+    try {
+        $depFields = $oDepInfo->Load( $aFields['DEP_UID'] );
+        $aFields['USR_DEPARTMENT'] = $depFields['DEP_TITLE'];
+    } catch (Exception $e) {
+        $oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
+        $oUser->setDepUid( '' );
+        $oUser->save();
+    }
+
+    //Load Calendar options and falue for this user
+    G::LoadClass( 'calendar' );
+    $calendar = new Calendar();
+    $calendarObj = $calendar->getCalendarList( true, true );
+    global $_DBArray;
+    $_DBArray['availableCalendars'] = $calendarObj['array'];
+    $_SESSION['_DBArray'] = $_DBArray;
+    $calendarInfo = $calendar->getCalendarFor( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] );
+    //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
+    $aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
+    $aFields['RANDOM'] = rand();
+
+    /////////////////////////
+    //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
+    require_once 'classes/model/Users.php';
+    $oCriteria = new Criteria();
+    $oCriteria->addSelectColumn( UsersPeer::USR_UID );
+    $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
+    $oCriteria->add( UsersPeer::USR_STATUS, 'ACTIVE' );
+    $oCriteria->add( UsersPeer::USR_UID, $_GET['USR_UID'], Criteria::NOT_EQUAL );
+    $oDataset = UsersPeer::doSelectRS( $oCriteria );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    ///////////////////////
+    G::loadClass( 'configuration' );
+    $oConf = new Configurations();
+    $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+
+    $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
+
+    $aUserInfo = array ();
+    $aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char'
+    );
+    while ($oDataset->next()) {
+        $aRow1 = $oDataset->getRow();
+
+        $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
+        $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
+        );
+    }
+
+    //calculating the max upload file size;
+    $POST_MAX_SIZE = ini_get( 'post_max_size' );
+    $mul = substr( $POST_MAX_SIZE, - 1 );
+    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+    $postMaxSize = (int) $POST_MAX_SIZE * $mul;
+
+    $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+    $mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+    $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
+
+    if ($postMaxSize < $uploadMaxSize)
+        $uploadMaxSize = $postMaxSize;
+    $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
+
+    global $_DBArray;
+    $_DBArray['aUserInfo'] = $aUserInfo;
+    $_SESSION['_DBArray'] = $_DBArray;
+    if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') {
+        //always show this form  users_EditRT.xml.
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
+    } else {
+        //for users ldap always show this form users_EditLDAP.xml.
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
+    }
+
+    G::RenderPage( 'publish', 'blank' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
+}
+

From 41b01296e024cdb619087194c0825aa8ce408eaf Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Thu, 30 Jun 2016 14:23:53 -0400
Subject: [PATCH 08/16] =?UTF-8?q?HOR-1387=20Agregar=20los=20campos=20que?=
 =?UTF-8?q?=20se=20guardan=20en=20CONTENT=20que=20est=C3=A1n=20relacionado?=
 =?UTF-8?q?s=20a=20APPLICATION?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/classes/class.AppSolr.php     |  60 +---
 workflow/engine/classes/class.case.php        |  44 +--
 workflow/engine/classes/model/Application.php | 196 ++----------
 workflow/engine/classes/model/ListInbox.php   |  11 +-
 .../engine/classes/model/ListUnassigned.php   |  14 +-
 .../model/map/ApplicationMapBuilder.php       |   4 +
 .../classes/model/om/BaseApplication.php      | 294 ++++++++++++------
 .../classes/model/om/BaseApplicationPeer.php  |  28 +-
 workflow/engine/config/schema.xml             |   2 +
 workflow/engine/data/mysql/schema.sql         |   3 +-
 10 files changed, 281 insertions(+), 375 deletions(-)

diff --git a/workflow/engine/classes/class.AppSolr.php b/workflow/engine/classes/class.AppSolr.php
index 31897f136..4d41c9077 100755
--- a/workflow/engine/classes/class.AppSolr.php
+++ b/workflow/engine/classes/class.AppSolr.php
@@ -2609,6 +2609,7 @@ class AppSolr
     $c = new Criteria ();
     
     $c->addSelectColumn (ApplicationPeer::APP_UID);
+    $c->addSelectColumn (ApplicationPeer::APP_TITLE);
     $c->addSelectColumn (ApplicationPeer::APP_NUMBER);
     $c->addSelectColumn (ApplicationPeer::APP_STATUS);
     $c->addSelectColumn (ApplicationPeer::PRO_UID);
@@ -2616,10 +2617,9 @@ class AppSolr
     $c->addSelectColumn (ApplicationPeer::APP_FINISH_DATE);
     $c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE);
     $c->addSelectColumn (ApplicationPeer::APP_DATA);
-    
-    $c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE');
-    $c->addAsColumn ('PRO_TITLE', 'cpro.CON_VALUE');
-    
+
+    $c->addSelectColumn (ProcessPeer::PRO_TITLE);
+
     $c->addSelectColumn ('ad.DEL_INDEX');
     $c->addSelectColumn ('ad.DEL_PREVIOUS');
     $c->addSelectColumn ('ad.TAS_UID');
@@ -2644,43 +2644,12 @@ class AppSolr
     $c->addSelectColumn ('at.APP_THREAD_PARENT');
     $c->addSelectColumn ('at.APP_THREAD_STATUS');
     
-    $c->addAlias ('capp', 'CONTENT');
-    $c->addAlias ('cpro', 'CONTENT');
     $c->addAlias ('ad', 'APP_DELEGATION');
     $c->addAlias ('at', 'APP_THREAD');
     
-    $aConditions = array ();
-    $aConditions [] = array (
-        ApplicationPeer::APP_UID,
-        'capp.CON_ID' 
-    );
-    $aConditions [] = array (
-        'capp.CON_CATEGORY',
-        DBAdapter::getStringDelimiter () . 'APP_TITLE' . DBAdapter::getStringDelimiter () 
-    );
-    $aConditions [] = array (
-        'capp.CON_LANG',
-        DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter () 
-    );
-    $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-    
-    $aConditions = array ();
-    $aConditions [] = array (
-        ApplicationPeer::PRO_UID,
-        'cpro.CON_ID' 
-    );
-    $aConditions [] = array (
-        'cpro.CON_CATEGORY',
-        DBAdapter::getStringDelimiter () . 'PRO_TITLE' . DBAdapter::getStringDelimiter () 
-    );
-    $aConditions [] = array (
-        'cpro.CON_LANG',
-        DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter () 
-    );
-    $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-    
+    $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
     $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);
-    
+
     $aConditions = array ();
     $aConditions [] = array (
         'ad.APP_UID',
@@ -2725,6 +2694,7 @@ class AppSolr
     $c = new Criteria ();
   
     $c->addSelectColumn (ApplicationPeer::APP_UID);
+    $c->addSelectColumn (ApplicationPeer::APP_TITLE);
     $c->addSelectColumn (ApplicationPeer::APP_NUMBER);
     $c->addSelectColumn (ApplicationPeer::APP_STATUS);
     $c->addSelectColumn (ApplicationPeer::PRO_UID);
@@ -2733,7 +2703,6 @@ class AppSolr
     $c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE);
     $c->addSelectColumn (ApplicationPeer::APP_DATA);
   
-    $c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE');
     $c->addSelectColumn ('pro.PRO_TITLE');
   
     $c->addSelectColumn ('ad.DEL_INDEX');
@@ -2766,26 +2735,11 @@ class AppSolr
 
     $c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY");
 
-    $c->addAlias ('capp', 'CONTENT');
     $c->addAlias ('ad', 'APP_DELEGATION');
     $c->addAlias ('at', 'APP_THREAD');
     $c->addAlias ('ade', 'APP_DELAY');
     $c->addAlias ("pro", ProcessPeer::TABLE_NAME);
   
-    $aConditions = array ();
-    $aConditions [] = array (
-        ApplicationPeer::APP_UID,
-        'capp.CON_ID'
-    );
-    $aConditions [] = array (
-        'capp.CON_CATEGORY',
-        DBAdapter::getStringDelimiter () . 'APP_TITLE' . DBAdapter::getStringDelimiter ()
-    );
-    $aConditions [] = array (
-        'capp.CON_LANG',
-        DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
-    );
-    $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
     $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
     $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);
   
diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index a91b2606a..c30012e58 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -2706,6 +2706,7 @@ class Cases
         $c = new Criteria('workflow');
         $c->clearSelectColumns();
         $c->addSelectColumn(ApplicationPeer::APP_UID);
+        $c->addSelectColumn(ApplicationPeer::APP_TITLE);
         $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
         $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
         $c->addSelectColumn(ApplicationPeer::PRO_UID);
@@ -2730,7 +2731,6 @@ class Cases
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
         $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
         $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
@@ -2740,7 +2740,6 @@ class Cases
             APP_LAST_USER.USR_FIRSTNAME)"
         );
 
-        $c->addAlias("APP_TITLE", 'CONTENT');
         $c->addAlias("PRO_TITLE", 'CONTENT');
         $c->addAlias("TAS_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
@@ -2754,12 +2753,6 @@ class Cases
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
         $del = DBAdapter::getStringDelimiter();
-        $appTitleConds = array();
-        $appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
-        $appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
-        $appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
-
         $proTitleConds = array();
         $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
         $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
@@ -2955,6 +2948,7 @@ class Cases
                 $c = new Criteria('workflow');
                 $c->clearSelectColumns();
                 $c->addSelectColumn(ApplicationPeer::APP_UID);
+                $c->addSelectColumn(ApplicationPeer::APP_TITLE);
                 $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
                 $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
                 $c->addSelectColumn(ApplicationPeer::PRO_UID);
@@ -2974,11 +2968,9 @@ class Cases
                 $c->addSelectColumn(UsersPeer::USR_UID);
                 $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
                 $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-                $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
                 $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
                 $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
 
-                $c->addAlias("APP_TITLE", 'CONTENT');
                 $c->addAlias("PRO_TITLE", 'CONTENT');
                 $c->addAlias("TAS_TITLE", 'CONTENT');
 
@@ -2990,11 +2982,6 @@ class Cases
                 $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
                 $del = DBAdapter::getStringDelimiter();
-                $appTitleConds = array();
-                $appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
-                $appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
-                $appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
-                $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
                 //
                 $proTitleConds = array();
                 $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
@@ -3141,7 +3128,7 @@ class Cases
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
         if ($titles) {
-            $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
+            $c->addSelectColumn(ApplicationPeer::APP_TITLE);
             $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
             $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
         }
@@ -3150,7 +3137,6 @@ class Cases
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
 
         if ($titles) {
-            $c->addAlias("APP_TITLE", 'CONTENT');
             $c->addAlias("PRO_TITLE", 'CONTENT');
             $c->addAlias("TAS_TITLE", 'CONTENT');
         }
@@ -3166,12 +3152,6 @@ class Cases
 
         if ($titles) {
             $del = DBAdapter::getStringDelimiter();
-            $appTitleConds = array();
-            $appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
-            $appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
-            $appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
-            $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
-
             $proTitleConds = array();
             $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
             $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
@@ -3224,6 +3204,7 @@ class Cases
         $c = new Criteria('workflow');
         $c->clearSelectColumns();
         $c->addSelectColumn(ApplicationPeer::APP_UID);
+        $c->addSelectColumn(ApplicationPeer::APP_TITLE);
         $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
         $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
         $c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY);
@@ -3240,14 +3221,12 @@ class Cases
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
         $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
         $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
 
-        $c->addAlias("APP_TITLE", 'CONTENT');
         $c->addAlias("PRO_TITLE", 'CONTENT');
         $c->addAlias("TAS_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
@@ -3261,12 +3240,6 @@ class Cases
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
         $del = DBAdapter::getStringDelimiter();
-        $appTitleConds = array();
-        $appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
-        $appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
-        $appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
-
         $proTitleConds = array();
         $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
         $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
@@ -6804,6 +6777,7 @@ class Cases
         $c = new Criteria('workflow');
         $c->clearSelectColumns();
         $c->addSelectColumn(ApplicationPeer::APP_UID);
+        $c->addSelectColumn(ApplicationPeer::APP_TITLE);
         $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
         $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
         $c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY);
@@ -6818,7 +6792,6 @@ class Cases
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
         $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
         $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
@@ -6826,7 +6799,6 @@ class Cases
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"
         );
 
-        $c->addAlias("APP_TITLE", 'CONTENT');
         $c->addAlias("PRO_TITLE", 'CONTENT');
         $c->addAlias("TAS_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
@@ -6840,12 +6812,6 @@ class Cases
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
         $del = DBAdapter::getStringDelimiter();
-        $appTitleConds = array();
-        $appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
-        $appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
-        $appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
-
         $proTitleConds = array();
         $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
         $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
diff --git a/workflow/engine/classes/model/Application.php b/workflow/engine/classes/model/Application.php
index 714b846f9..937cc48c6 100755
--- a/workflow/engine/classes/model/Application.php
+++ b/workflow/engine/classes/model/Application.php
@@ -46,15 +46,15 @@ class Application extends BaseApplication
      * This value goes in the content table
      * @var        string
      */
-    protected $app_title = '';
-    protected $app_description = '';
+    protected $app_title_content = '';
+    protected $app_description_content = '';
     //protected $app_proc_code = '';
 
     /**
-     * Get the [app_title] column value.
+     * Get the [app_title_content] column value.
      * @return     string
      */
-    public function getAppTitle()
+    public function getAppTitleContent()
     {
         $oApplication = new Application;
         if (!$oApplication->exists($this->getAppUid())) {
@@ -66,18 +66,18 @@ class Application extends BaseApplication
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->app_title = Content::load('APP_TITLE', '', $this->getAppUid(), $lang);
+        $this->app_title_content = Content::load('APP_TITLE', '', $this->getAppUid(), $lang);
 
-        return $this->app_title;
+        return $this->app_title_content;
     }
 
     /**
-     * Set the [app_title] column value.
+     * Set the [app_title_content] column value.
      *
      * @param      string $v new value
      * @return     void
      */
-    public function setAppTitle($v)
+    public function setAppTitleContent($v)
     {
         if ($this->getAppUid() == '') {
             throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank"));
@@ -89,163 +89,36 @@ class Application extends BaseApplication
             $v = (string) $v;
         }
 
-        if ($this->app_title !== $v || $v === '') {
-            $this->app_title = $v;
+        if ($this->app_title_content !== $v || $v === '') {
+            $this->app_title_content = $v;
             $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-            $res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title);
+            $res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title_content);
         }
     } // set()
 
     /**
-     * Get the [app_description] column value.
+     * Get the [app_description_content] column value.
      * @return     string
      */
-    public function getAppDescription()
+    public function getAppDescriptionContent()
     {
         if ($this->getAppUid() == '') {
             throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->app_description = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang);
+        $this->app_description_content = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang);
 
-        return $this->app_description;
-    }
-
-    public function isEmptyInContent($content, $field, $lang)
-    {
-        if (isset($content[$field][$lang])) {
-            if (trim($content[$field][$lang]) != '') {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public function updateInsertContent($content, $field, $value)
-    {
-        if (isset($content[$field]['en'])) {
-            //update
-            $con = ContentPeer::retrieveByPK($field, '', $this->getAppUid(), 'en');
-            $con->setConValue($value);
-            if ($con->validate()) {
-                $res = $con->save();
-            }
-        } else {
-            //insert
-            $con = new Content();
-            $con->setConCategory($field);
-            $con->setConParent('');
-            $con->setConId($this->getAppUid());
-            $con->setConLang('en');
-            $con->setConValue($value);
-
-            if ($con->validate()) {
-                $res = $con->save();
-            }
-        }
-    }
-
-    public function normalizeContent($content, $field, $lang)
-    {
-        $value = '';
-
-        //if the lang row is not empty, update in 'en' row and continue
-        if (!$this->isEmptyInContent($content, $field, $lang)) {
-            //update/insert only if this lang is != 'en', with this always we will have an en row with last value
-            $value = $content[$field][$lang];
-
-            if ($lang != 'en') {
-                $this->updateInsertContent($content, $field, $value);
-            }
-        } else {
-            //if the lang row is empty, and 'en' row is not empty return 'en' value
-            if (!$this->isEmptyInContent($content, $field, 'en')) {
-                $value = $content[$field]['en'];
-            }
-
-            //if the lang row is empty, and 'en' row is empty get value for 'other' row and update in 'en'
-            //row and continue
-            if ($this->isEmptyInContent($content, $field, 'en')) {
-                if (isset($content[$field]) && is_array($content[$field])) {
-                    foreach ($content[$field] as $lan => $val) {
-                        if (trim($val) != '') {
-                            $value = $val;
-
-                            if ($lan != 'en') {
-                                $this->updateInsertContent($content, $field , $value);
-                                continue;
-                            }
-                        }
-                    }
-                } else {
-                    $this->updateInsertContent($content, $field, '');
-                }
-            }
-        }
-
-        return $value;
+        return $this->app_description_content;
     }
 
     /**
-     * Get the [app_description] , [app_title] column values.
-     * @return     array of string
-     */
-    public function getContentFields()
-    {
-        if ($this->getAppUid() == '') {
-            throw (new Exception("Error in getContentFields, the APP_UID can't be blank"));
-        }
-
-        $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $c = new Criteria();
-        $c->clearSelectColumns();
-        $c->addSelectColumn(ContentPeer::CON_CATEGORY);
-        $c->addSelectColumn(ContentPeer::CON_LANG);
-        $c->addSelectColumn(ContentPeer::CON_VALUE);
-        $c->add(ContentPeer::CON_ID,  $this->getAppUid());
-        //$c->add(ContentPeer::CON_LANG, $lang);
-        $c->addAscendingOrderByColumn('CON_CATEGORY');
-        $c->addAscendingOrderByColumn('CON_LANG');
-        $rs = ContentPeer::doSelectRS($c);
-        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $rs->next();
-        $content = array();
-
-        while ($row = $rs->getRow()) {
-            $conCategory = $row['CON_CATEGORY'];
-            $conLang     = $row['CON_LANG'];
-
-            if (!isset($content[$conCategory])) {
-                $content[$conCategory] = array();
-            }
-
-            if (!isset($content[$conCategory][$conLang])) {
-                $content[$conCategory][$conLang] = array();
-            }
-
-            $content[$conCategory][$conLang] = $row['CON_VALUE'];
-            $rs->next();
-            $row = $rs->getRow();
-        }
-
-        $appTitle       = $this->normalizeContent($content, 'APP_TITLE', $lang);
-        $appDescription = $this->normalizeContent($content, 'APP_DESCRIPTION', $lang);
-
-        $res['APP_TITLE']       = $appTitle;
-        $res['APP_DESCRIPTION'] = $appDescription;
-
-        return $res;
-    }
-
-    /**
-     * Set the [app_description] column value.
+     * Set the [app_description_content] column value.
      *
      * @param      string $v new value
      * @return     void
      */
-    public function setAppDescription($v)
+    public function setAppDescriptionContent($v)
     {
         if ($this->getAppUid() == '') {
             throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") );
@@ -257,10 +130,10 @@ class Application extends BaseApplication
             $v = (string) $v;
         }
 
-        if ($this->app_description !== $v || $v === '') {
-            $this->app_description = $v;
+        if ($this->app_description_content !== $v || $v === '') {
+            $this->app_description_content = $v;
             $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-            $res = Content::addContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, $this->app_description);
+            $res = Content::addContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, $this->app_description_content);
         }
     } // set()
 
@@ -315,23 +188,13 @@ class Application extends BaseApplication
         $con = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
 
         try {
-            $oApplication = ApplicationPeer::retrieveByPk( $AppUid );
+            $oApplication = ApplicationPeer::retrieveByPK( $AppUid );
             if (!$oApplication) {
                 return false;
             }
             if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) {
                 $aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME);
                 $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
-
-                //this is the new function to optimize content queries
-                $aContentFields = $oApplication->getContentFields();
-
-                $aFields['APP_TITLE']       = $aContentFields['APP_TITLE'];
-                $aFields['APP_DESCRIPTION'] = $aContentFields['APP_DESCRIPTION'];
-
-                $this->app_title       = $aFields['APP_TITLE'];
-                $this->app_description = $aFields['APP_DESCRIPTION'];
-
                 //$aFields['APP_PROC_CODE'] = $oApplication->getAppProcCode();
                 //$this->setAppProcCode($oApplication->getAppProcCode());
 
@@ -383,16 +246,17 @@ class Application extends BaseApplication
 
             $this->setAppNumber($maxNumber);
             $this->setAppData(serialize(['APP_NUMBER' => $maxNumber, 'PIN' => $pin]));
+            $this->setAppTitle('#' . $maxNumber);
+            $this->setAppDescription('');
 
             if ($this->validate()) {
                 $con->begin();
                 $res = $this->save();
                 $con->commit();
 
+                $this->setAppTitleContent('#' . $maxNumber);
+                $this->setAppDescriptionContent('');
                 //to do: ID_CASE in translation $this->setAppTitle(G::LoadTranslation('ID_CASE') . $maxNumber);
-                $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-                Content::insertContent('APP_TITLE', '', $this->getAppUid(), $lang, '#' . $maxNumber);
-                Content::insertContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, '');
                 //Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, '');
 
                 $con->commit();
@@ -431,10 +295,10 @@ class Application extends BaseApplication
 
                 if ($oApp->validate()) {
                     if (isset($aData['APP_TITLE'])) {
-                        $oApp->setAppTitle($aData['APP_TITLE']);
+                        $this->setAppTitleContent($aData['APP_TITLE']);
                     }
                     if (isset($aData['APP_DESCRIPTION'])) {
-                        $oApp->setAppDescription($aData['APP_DESCRIPTION']);
+                        $this->setAppDescriptionContent($aData['APP_DESCRIPTION']);
                     }
 
                     //if ( isset ( $aData['APP_PROC_CODE'] ) )
@@ -511,6 +375,8 @@ class Application extends BaseApplication
         $this->setAppUid(G::generateUniqueID());
 
         $this->setAppNumber($maxNumber);
+        $this->setAppTitle('');
+        $this->setAppDescription('');
         $this->setAppParent(isset($aData['APP_PARENT'])? $aData['APP_PARENT'] : 0);
         $this->setAppStatus(isset($aData['APP_STATUS'])? $aData['APP_STATUS'] : 'DRAFT');
         $this->setProUid($aData['PRO_UID']);
@@ -558,8 +424,8 @@ class Application extends BaseApplication
 
         if ($this->validate()) {
             $res = $this->save();
-            $this->setAppTitle('');
-            $this->setAppDescription('');
+            $this->setAppTitleContent('');
+            $this->setAppDescriptionContent('');
             $this->setAppProcCode('');
         } else {
             // Something went wrong. We can now get the validationFailures and handle them.
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index 2c07ae0e8..02b265dc9 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -266,14 +266,13 @@ class ListInbox extends BaseListInbox
         $aRow = $dataset->getRow();
         if ($aRow['CON_VALUE'] == '') { 
             $criteria = new Criteria();
-            $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-            $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
-            $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
-            $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-            $dataset = ContentPeer::doSelectRS($criteria);
+            $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
+            $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+            $dataset = ApplicationPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
-            $aRow = $dataset->getRow();
+            $aRowApp = $dataset->getRow();
+            $aRow['CON_VALUE'] = $aRowApp['APP_TITLE'];
         }
         $data['APP_TITLE'] = $aRow['CON_VALUE'];
 
diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php
index 296597ab5..f143e38b8 100644
--- a/workflow/engine/classes/model/ListUnassigned.php
+++ b/workflow/engine/classes/model/ListUnassigned.php
@@ -101,6 +101,7 @@ class ListUnassigned extends BaseListUnassigned
 
         $criteria = new Criteria();
         $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
+        $criteria->addSelectColumn( ApplicationPeer::APP_TITLE );
         $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
         $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
         $dataset = ApplicationPeer::doSelectRS($criteria);
@@ -109,19 +110,6 @@ class ListUnassigned extends BaseListUnassigned
         $aRow = $dataset->getRow();
         $data = array_merge($data, $aRow);
 
-
-        $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
-        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $dataset->next();
-        $aRow = $dataset->getRow();
-        $data['APP_TITLE'] = $aRow['CON_VALUE'];
-
-
         $criteria = new Criteria();
         $criteria->addSelectColumn(ContentPeer::CON_VALUE);
         $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );
diff --git a/workflow/engine/classes/model/map/ApplicationMapBuilder.php b/workflow/engine/classes/model/map/ApplicationMapBuilder.php
index fe40e034e..167f35e29 100755
--- a/workflow/engine/classes/model/map/ApplicationMapBuilder.php
+++ b/workflow/engine/classes/model/map/ApplicationMapBuilder.php
@@ -67,6 +67,10 @@ class ApplicationMapBuilder
 
         $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
+        $tMap->addColumn('APP_DESCRIPTION', 'AppDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
         $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
 
         $tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32);
diff --git a/workflow/engine/classes/model/om/BaseApplication.php b/workflow/engine/classes/model/om/BaseApplication.php
index e7e4dae81..437bdd259 100755
--- a/workflow/engine/classes/model/om/BaseApplication.php
+++ b/workflow/engine/classes/model/om/BaseApplication.php
@@ -33,6 +33,18 @@ abstract class BaseApplication extends BaseObject implements Persistent
      */
     protected $app_uid = '';
 
+    /**
+     * The value for the app_title field.
+     * @var        string
+     */
+    protected $app_title;
+
+    /**
+     * The value for the app_description field.
+     * @var        string
+     */
+    protected $app_description;
+
     /**
      * The value for the app_number field.
      * @var        int
@@ -166,6 +178,28 @@ abstract class BaseApplication extends BaseObject implements Persistent
         return $this->app_uid;
     }
 
+    /**
+     * Get the [app_title] column value.
+     * 
+     * @return     string
+     */
+    public function getAppTitle()
+    {
+
+        return $this->app_title;
+    }
+
+    /**
+     * Get the [app_description] column value.
+     * 
+     * @return     string
+     */
+    public function getAppDescription()
+    {
+
+        return $this->app_description;
+    }
+
     /**
      * Get the [app_number] column value.
      * 
@@ -470,6 +504,50 @@ abstract class BaseApplication extends BaseObject implements Persistent
 
     } // setAppUid()
 
+    /**
+     * Set the value of [app_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAppTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->app_title !== $v) {
+            $this->app_title = $v;
+            $this->modifiedColumns[] = ApplicationPeer::APP_TITLE;
+        }
+
+    } // setAppTitle()
+
+    /**
+     * Set the value of [app_description] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAppDescription($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->app_description !== $v) {
+            $this->app_description = $v;
+            $this->modifiedColumns[] = ApplicationPeer::APP_DESCRIPTION;
+        }
+
+    } // setAppDescription()
+
     /**
      * Set the value of [app_number] column.
      * 
@@ -901,48 +979,52 @@ abstract class BaseApplication extends BaseObject implements Persistent
 
             $this->app_uid = $rs->getString($startcol + 0);
 
-            $this->app_number = $rs->getInt($startcol + 1);
+            $this->app_title = $rs->getString($startcol + 1);
 
-            $this->app_parent = $rs->getString($startcol + 2);
+            $this->app_description = $rs->getString($startcol + 2);
 
-            $this->app_status = $rs->getString($startcol + 3);
+            $this->app_number = $rs->getInt($startcol + 3);
 
-            $this->pro_uid = $rs->getString($startcol + 4);
+            $this->app_parent = $rs->getString($startcol + 4);
 
-            $this->app_proc_status = $rs->getString($startcol + 5);
+            $this->app_status = $rs->getString($startcol + 5);
 
-            $this->app_proc_code = $rs->getString($startcol + 6);
+            $this->pro_uid = $rs->getString($startcol + 6);
 
-            $this->app_parallel = $rs->getString($startcol + 7);
+            $this->app_proc_status = $rs->getString($startcol + 7);
 
-            $this->app_init_user = $rs->getString($startcol + 8);
+            $this->app_proc_code = $rs->getString($startcol + 8);
 
-            $this->app_cur_user = $rs->getString($startcol + 9);
+            $this->app_parallel = $rs->getString($startcol + 9);
 
-            $this->app_create_date = $rs->getTimestamp($startcol + 10, null);
+            $this->app_init_user = $rs->getString($startcol + 10);
 
-            $this->app_init_date = $rs->getTimestamp($startcol + 11, null);
+            $this->app_cur_user = $rs->getString($startcol + 11);
 
-            $this->app_finish_date = $rs->getTimestamp($startcol + 12, null);
+            $this->app_create_date = $rs->getTimestamp($startcol + 12, null);
 
-            $this->app_update_date = $rs->getTimestamp($startcol + 13, null);
+            $this->app_init_date = $rs->getTimestamp($startcol + 13, null);
 
-            $this->app_data = $rs->getString($startcol + 14);
+            $this->app_finish_date = $rs->getTimestamp($startcol + 14, null);
 
-            $this->app_pin = $rs->getString($startcol + 15);
+            $this->app_update_date = $rs->getTimestamp($startcol + 15, null);
 
-            $this->app_duration = $rs->getFloat($startcol + 16);
+            $this->app_data = $rs->getString($startcol + 16);
 
-            $this->app_delay_duration = $rs->getFloat($startcol + 17);
+            $this->app_pin = $rs->getString($startcol + 17);
 
-            $this->app_drive_folder_uid = $rs->getString($startcol + 18);
+            $this->app_duration = $rs->getFloat($startcol + 18);
+
+            $this->app_delay_duration = $rs->getFloat($startcol + 19);
+
+            $this->app_drive_folder_uid = $rs->getString($startcol + 20);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 19; // 19 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 21; // 21 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Application object", $e);
@@ -1150,57 +1232,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
                 return $this->getAppUid();
                 break;
             case 1:
-                return $this->getAppNumber();
+                return $this->getAppTitle();
                 break;
             case 2:
-                return $this->getAppParent();
+                return $this->getAppDescription();
                 break;
             case 3:
-                return $this->getAppStatus();
+                return $this->getAppNumber();
                 break;
             case 4:
-                return $this->getProUid();
+                return $this->getAppParent();
                 break;
             case 5:
-                return $this->getAppProcStatus();
+                return $this->getAppStatus();
                 break;
             case 6:
-                return $this->getAppProcCode();
+                return $this->getProUid();
                 break;
             case 7:
-                return $this->getAppParallel();
+                return $this->getAppProcStatus();
                 break;
             case 8:
-                return $this->getAppInitUser();
+                return $this->getAppProcCode();
                 break;
             case 9:
-                return $this->getAppCurUser();
+                return $this->getAppParallel();
                 break;
             case 10:
-                return $this->getAppCreateDate();
+                return $this->getAppInitUser();
                 break;
             case 11:
-                return $this->getAppInitDate();
+                return $this->getAppCurUser();
                 break;
             case 12:
-                return $this->getAppFinishDate();
+                return $this->getAppCreateDate();
                 break;
             case 13:
-                return $this->getAppUpdateDate();
+                return $this->getAppInitDate();
                 break;
             case 14:
-                return $this->getAppData();
+                return $this->getAppFinishDate();
                 break;
             case 15:
-                return $this->getAppPin();
+                return $this->getAppUpdateDate();
                 break;
             case 16:
-                return $this->getAppDuration();
+                return $this->getAppData();
                 break;
             case 17:
-                return $this->getAppDelayDuration();
+                return $this->getAppPin();
                 break;
             case 18:
+                return $this->getAppDuration();
+                break;
+            case 19:
+                return $this->getAppDelayDuration();
+                break;
+            case 20:
                 return $this->getAppDriveFolderUid();
                 break;
             default:
@@ -1224,24 +1312,26 @@ abstract class BaseApplication extends BaseObject implements Persistent
         $keys = ApplicationPeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getAppUid(),
-            $keys[1] => $this->getAppNumber(),
-            $keys[2] => $this->getAppParent(),
-            $keys[3] => $this->getAppStatus(),
-            $keys[4] => $this->getProUid(),
-            $keys[5] => $this->getAppProcStatus(),
-            $keys[6] => $this->getAppProcCode(),
-            $keys[7] => $this->getAppParallel(),
-            $keys[8] => $this->getAppInitUser(),
-            $keys[9] => $this->getAppCurUser(),
-            $keys[10] => $this->getAppCreateDate(),
-            $keys[11] => $this->getAppInitDate(),
-            $keys[12] => $this->getAppFinishDate(),
-            $keys[13] => $this->getAppUpdateDate(),
-            $keys[14] => $this->getAppData(),
-            $keys[15] => $this->getAppPin(),
-            $keys[16] => $this->getAppDuration(),
-            $keys[17] => $this->getAppDelayDuration(),
-            $keys[18] => $this->getAppDriveFolderUid(),
+            $keys[1] => $this->getAppTitle(),
+            $keys[2] => $this->getAppDescription(),
+            $keys[3] => $this->getAppNumber(),
+            $keys[4] => $this->getAppParent(),
+            $keys[5] => $this->getAppStatus(),
+            $keys[6] => $this->getProUid(),
+            $keys[7] => $this->getAppProcStatus(),
+            $keys[8] => $this->getAppProcCode(),
+            $keys[9] => $this->getAppParallel(),
+            $keys[10] => $this->getAppInitUser(),
+            $keys[11] => $this->getAppCurUser(),
+            $keys[12] => $this->getAppCreateDate(),
+            $keys[13] => $this->getAppInitDate(),
+            $keys[14] => $this->getAppFinishDate(),
+            $keys[15] => $this->getAppUpdateDate(),
+            $keys[16] => $this->getAppData(),
+            $keys[17] => $this->getAppPin(),
+            $keys[18] => $this->getAppDuration(),
+            $keys[19] => $this->getAppDelayDuration(),
+            $keys[20] => $this->getAppDriveFolderUid(),
         );
         return $result;
     }
@@ -1277,57 +1367,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
                 $this->setAppUid($value);
                 break;
             case 1:
-                $this->setAppNumber($value);
+                $this->setAppTitle($value);
                 break;
             case 2:
-                $this->setAppParent($value);
+                $this->setAppDescription($value);
                 break;
             case 3:
-                $this->setAppStatus($value);
+                $this->setAppNumber($value);
                 break;
             case 4:
-                $this->setProUid($value);
+                $this->setAppParent($value);
                 break;
             case 5:
-                $this->setAppProcStatus($value);
+                $this->setAppStatus($value);
                 break;
             case 6:
-                $this->setAppProcCode($value);
+                $this->setProUid($value);
                 break;
             case 7:
-                $this->setAppParallel($value);
+                $this->setAppProcStatus($value);
                 break;
             case 8:
-                $this->setAppInitUser($value);
+                $this->setAppProcCode($value);
                 break;
             case 9:
-                $this->setAppCurUser($value);
+                $this->setAppParallel($value);
                 break;
             case 10:
-                $this->setAppCreateDate($value);
+                $this->setAppInitUser($value);
                 break;
             case 11:
-                $this->setAppInitDate($value);
+                $this->setAppCurUser($value);
                 break;
             case 12:
-                $this->setAppFinishDate($value);
+                $this->setAppCreateDate($value);
                 break;
             case 13:
-                $this->setAppUpdateDate($value);
+                $this->setAppInitDate($value);
                 break;
             case 14:
-                $this->setAppData($value);
+                $this->setAppFinishDate($value);
                 break;
             case 15:
-                $this->setAppPin($value);
+                $this->setAppUpdateDate($value);
                 break;
             case 16:
-                $this->setAppDuration($value);
+                $this->setAppData($value);
                 break;
             case 17:
-                $this->setAppDelayDuration($value);
+                $this->setAppPin($value);
                 break;
             case 18:
+                $this->setAppDuration($value);
+                break;
+            case 19:
+                $this->setAppDelayDuration($value);
+                break;
+            case 20:
                 $this->setAppDriveFolderUid($value);
                 break;
         } // switch()
@@ -1358,75 +1454,83 @@ abstract class BaseApplication extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[1], $arr)) {
-            $this->setAppNumber($arr[$keys[1]]);
+            $this->setAppTitle($arr[$keys[1]]);
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setAppParent($arr[$keys[2]]);
+            $this->setAppDescription($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setAppStatus($arr[$keys[3]]);
+            $this->setAppNumber($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setProUid($arr[$keys[4]]);
+            $this->setAppParent($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setAppProcStatus($arr[$keys[5]]);
+            $this->setAppStatus($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setAppProcCode($arr[$keys[6]]);
+            $this->setProUid($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setAppParallel($arr[$keys[7]]);
+            $this->setAppProcStatus($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setAppInitUser($arr[$keys[8]]);
+            $this->setAppProcCode($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setAppCurUser($arr[$keys[9]]);
+            $this->setAppParallel($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setAppCreateDate($arr[$keys[10]]);
+            $this->setAppInitUser($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setAppInitDate($arr[$keys[11]]);
+            $this->setAppCurUser($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setAppFinishDate($arr[$keys[12]]);
+            $this->setAppCreateDate($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setAppUpdateDate($arr[$keys[13]]);
+            $this->setAppInitDate($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setAppData($arr[$keys[14]]);
+            $this->setAppFinishDate($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setAppPin($arr[$keys[15]]);
+            $this->setAppUpdateDate($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setAppDuration($arr[$keys[16]]);
+            $this->setAppData($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setAppDelayDuration($arr[$keys[17]]);
+            $this->setAppPin($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setAppDriveFolderUid($arr[$keys[18]]);
+            $this->setAppDuration($arr[$keys[18]]);
+        }
+
+        if (array_key_exists($keys[19], $arr)) {
+            $this->setAppDelayDuration($arr[$keys[19]]);
+        }
+
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setAppDriveFolderUid($arr[$keys[20]]);
         }
 
     }
@@ -1444,6 +1548,14 @@ abstract class BaseApplication extends BaseObject implements Persistent
             $criteria->add(ApplicationPeer::APP_UID, $this->app_uid);
         }
 
+        if ($this->isColumnModified(ApplicationPeer::APP_TITLE)) {
+            $criteria->add(ApplicationPeer::APP_TITLE, $this->app_title);
+        }
+
+        if ($this->isColumnModified(ApplicationPeer::APP_DESCRIPTION)) {
+            $criteria->add(ApplicationPeer::APP_DESCRIPTION, $this->app_description);
+        }
+
         if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) {
             $criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number);
         }
@@ -1570,6 +1682,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
     public function copyInto($copyObj, $deepCopy = false)
     {
 
+        $copyObj->setAppTitle($this->app_title);
+
+        $copyObj->setAppDescription($this->app_description);
+
         $copyObj->setAppNumber($this->app_number);
 
         $copyObj->setAppParent($this->app_parent);
diff --git a/workflow/engine/classes/model/om/BaseApplicationPeer.php b/workflow/engine/classes/model/om/BaseApplicationPeer.php
index e9a54e409..508479f0b 100755
--- a/workflow/engine/classes/model/om/BaseApplicationPeer.php
+++ b/workflow/engine/classes/model/om/BaseApplicationPeer.php
@@ -25,7 +25,7 @@ abstract class BaseApplicationPeer
     const CLASS_DEFAULT = 'classes.model.Application';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 19;
+    const NUM_COLUMNS = 21;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseApplicationPeer
     /** the column name for the APP_UID field */
     const APP_UID = 'APPLICATION.APP_UID';
 
+    /** the column name for the APP_TITLE field */
+    const APP_TITLE = 'APPLICATION.APP_TITLE';
+
+    /** the column name for the APP_DESCRIPTION field */
+    const APP_DESCRIPTION = 'APPLICATION.APP_DESCRIPTION';
+
     /** the column name for the APP_NUMBER field */
     const APP_NUMBER = 'APPLICATION.APP_NUMBER';
 
@@ -99,10 +105,10 @@ abstract class BaseApplicationPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', 'AppDriveFolderUid', ),
-        BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ApplicationPeer::APP_DRIVE_FOLDER_UID, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', 'APP_DRIVE_FOLDER_UID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
+        BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppTitle', 'AppDescription', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', 'AppDriveFolderUid', ),
+        BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_TITLE, ApplicationPeer::APP_DESCRIPTION, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ApplicationPeer::APP_DRIVE_FOLDER_UID, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_TITLE', 'APP_DESCRIPTION', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', 'APP_DRIVE_FOLDER_UID', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
     );
 
     /**
@@ -112,10 +118,10 @@ abstract class BaseApplicationPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppNumber' => 1, 'AppParent' => 2, 'AppStatus' => 3, 'ProUid' => 4, 'AppProcStatus' => 5, 'AppProcCode' => 6, 'AppParallel' => 7, 'AppInitUser' => 8, 'AppCurUser' => 9, 'AppCreateDate' => 10, 'AppInitDate' => 11, 'AppFinishDate' => 12, 'AppUpdateDate' => 13, 'AppData' => 14, 'AppPin' => 15, 'AppDuration' => 16, 'AppDelayDuration' => 17, 'AppDriveFolderUid' => 18, ),
-        BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_NUMBER => 1, ApplicationPeer::APP_PARENT => 2, ApplicationPeer::APP_STATUS => 3, ApplicationPeer::PRO_UID => 4, ApplicationPeer::APP_PROC_STATUS => 5, ApplicationPeer::APP_PROC_CODE => 6, ApplicationPeer::APP_PARALLEL => 7, ApplicationPeer::APP_INIT_USER => 8, ApplicationPeer::APP_CUR_USER => 9, ApplicationPeer::APP_CREATE_DATE => 10, ApplicationPeer::APP_INIT_DATE => 11, ApplicationPeer::APP_FINISH_DATE => 12, ApplicationPeer::APP_UPDATE_DATE => 13, ApplicationPeer::APP_DATA => 14, ApplicationPeer::APP_PIN => 15, ApplicationPeer::APP_DURATION => 16, ApplicationPeer::APP_DELAY_DURATION => 17, ApplicationPeer::APP_DRIVE_FOLDER_UID => 18, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_NUMBER' => 1, 'APP_PARENT' => 2, 'APP_STATUS' => 3, 'PRO_UID' => 4, 'APP_PROC_STATUS' => 5, 'APP_PROC_CODE' => 6, 'APP_PARALLEL' => 7, 'APP_INIT_USER' => 8, 'APP_CUR_USER' => 9, 'APP_CREATE_DATE' => 10, 'APP_INIT_DATE' => 11, 'APP_FINISH_DATE' => 12, 'APP_UPDATE_DATE' => 13, 'APP_DATA' => 14, 'APP_PIN' => 15, 'APP_DURATION' => 16, 'APP_DELAY_DURATION' => 17, 'APP_DRIVE_FOLDER_UID' => 18, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
+        BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppTitle' => 1, 'AppDescription' => 2, 'AppNumber' => 3, 'AppParent' => 4, 'AppStatus' => 5, 'ProUid' => 6, 'AppProcStatus' => 7, 'AppProcCode' => 8, 'AppParallel' => 9, 'AppInitUser' => 10, 'AppCurUser' => 11, 'AppCreateDate' => 12, 'AppInitDate' => 13, 'AppFinishDate' => 14, 'AppUpdateDate' => 15, 'AppData' => 16, 'AppPin' => 17, 'AppDuration' => 18, 'AppDelayDuration' => 19, 'AppDriveFolderUid' => 20, ),
+        BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_TITLE => 1, ApplicationPeer::APP_DESCRIPTION => 2, ApplicationPeer::APP_NUMBER => 3, ApplicationPeer::APP_PARENT => 4, ApplicationPeer::APP_STATUS => 5, ApplicationPeer::PRO_UID => 6, ApplicationPeer::APP_PROC_STATUS => 7, ApplicationPeer::APP_PROC_CODE => 8, ApplicationPeer::APP_PARALLEL => 9, ApplicationPeer::APP_INIT_USER => 10, ApplicationPeer::APP_CUR_USER => 11, ApplicationPeer::APP_CREATE_DATE => 12, ApplicationPeer::APP_INIT_DATE => 13, ApplicationPeer::APP_FINISH_DATE => 14, ApplicationPeer::APP_UPDATE_DATE => 15, ApplicationPeer::APP_DATA => 16, ApplicationPeer::APP_PIN => 17, ApplicationPeer::APP_DURATION => 18, ApplicationPeer::APP_DELAY_DURATION => 19, ApplicationPeer::APP_DRIVE_FOLDER_UID => 20, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_TITLE' => 1, 'APP_DESCRIPTION' => 2, 'APP_NUMBER' => 3, 'APP_PARENT' => 4, 'APP_STATUS' => 5, 'PRO_UID' => 6, 'APP_PROC_STATUS' => 7, 'APP_PROC_CODE' => 8, 'APP_PARALLEL' => 9, 'APP_INIT_USER' => 10, 'APP_CUR_USER' => 11, 'APP_CREATE_DATE' => 12, 'APP_INIT_DATE' => 13, 'APP_FINISH_DATE' => 14, 'APP_UPDATE_DATE' => 15, 'APP_DATA' => 16, 'APP_PIN' => 17, 'APP_DURATION' => 18, 'APP_DELAY_DURATION' => 19, 'APP_DRIVE_FOLDER_UID' => 20, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
     );
 
     /**
@@ -218,6 +224,10 @@ abstract class BaseApplicationPeer
 
         $criteria->addSelectColumn(ApplicationPeer::APP_UID);
 
+        $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
+
+        $criteria->addSelectColumn(ApplicationPeer::APP_DESCRIPTION);
+
         $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
 
         $criteria->addSelectColumn(ApplicationPeer::APP_PARENT);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 07724680b..e6fa3c5b1 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -22,6 +22,8 @@
       <parameter name="Comment" value="The application"/>
     </vendor>
     <column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+    <column name="APP_TITLE" type="LONGVARCHAR" required="true"/>
+    <column name="APP_DESCRIPTION" type="LONGVARCHAR"/>
     <column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
     <column name="APP_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
     <column name="APP_STATUS" type="VARCHAR" size="100" required="true" default=""/>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 30681a5c0..72de84cee 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -13,6 +13,8 @@ DROP TABLE IF EXISTS `APPLICATION`;
 CREATE TABLE `APPLICATION`
 (
 	`APP_UID` VARCHAR(32) default '' NOT NULL,
+	`APP_TITLE` MEDIUMTEXT  NOT NULL,
+	`APP_DESCRIPTION` MEDIUMTEXT,
 	`APP_NUMBER` INTEGER default 0 NOT NULL,
 	`APP_PARENT` VARCHAR(32) default '0' NOT NULL,
 	`APP_STATUS` VARCHAR(100) default '' NOT NULL,
@@ -37,7 +39,6 @@ CREATE TABLE `APPLICATION`
 	KEY `indexAppStatus`(`APP_STATUS`),
 	KEY `indexAppCreateDate`(`APP_CREATE_DATE`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='The application';
-
 #-----------------------------------------------------------------------------
 #-- APP_SEQUENCE
 #-----------------------------------------------------------------------------

From e910e146ede00f6f60f4b61414ddf8839360fc67 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Fri, 1 Jul 2016 09:58:57 -0400
Subject: [PATCH 09/16] HOR-1385 Agregar los campos INP_DOC_TITLE y
 INP_DOC_DESCRIPTION en la tabla INPUT_DOCUMENT

---
 workflow/engine/classes/class.processMap.php  | 106 ++-------
 workflow/engine/classes/class.processes.php   |   2 +-
 .../engine/classes/model/InputDocument.php    |  62 +++---
 .../model/map/InputDocumentMapBuilder.php     |   4 +
 .../classes/model/om/BaseInputDocument.php    | 204 ++++++++++++++----
 .../model/om/BaseInputDocumentPeer.php        |  28 ++-
 workflow/engine/config/schema.xml             |   2 +
 workflow/engine/data/mysql/schema.sql         |   2 +
 .../methods/inputdocs/inputdocs_Save.php      |  38 ++--
 .../BusinessModel/CaseTracker.php             |  24 +--
 .../BusinessModel/InputDocument.php           |  34 +--
 .../ProcessMaker/BusinessModel/Process.php    |   2 +-
 .../BusinessModel/ProcessSupervisor.php       |  57 +----
 .../src/ProcessMaker/BusinessModel/Task.php   |  24 +--
 14 files changed, 266 insertions(+), 323 deletions(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 6b269e0b4..25876588a 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -967,13 +967,7 @@ class processMap
             }
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID' );
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter );
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
             $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN);
             $oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
@@ -983,7 +977,9 @@ class processMap
 
                 if (($aRow['INP_DOC_TITLE'] == null) || ($aRow['INP_DOC_TITLE'] == "")) {
                     // There is no transaltion for this Document name, try to get/regenerate the label
-                    $aRow['INP_DOC_TITLE'] = Content::Load("INP_DOC_TITLE", "", $aRow['INP_DOC_UID'], SYS_LANG);
+                    $oInputDocument = new InputDocument;
+                    $row = $oInputDocument->load($aRow['INP_DOC_UID']);
+                    $aRow['INP_DOC_TITLE'] = $row['INP_DOC_TITLE'];
                 }
                 $aBB[] = array('STEP_UID' => $aRow['INP_DOC_UID'], 'STEP_TITLE' => $aRow['INP_DOC_TITLE'], 'STEP_TYPE_OBJ' => 'INPUT_DOCUMENT', 'STEP_MODE' => '<input type="hidden" id="STEP_MODE_' . $aRow['INP_DOC_UID'] . '">' );
                 $oDataset->next();
@@ -2149,24 +2145,11 @@ class processMap
 
     public function getInputDocumentsCriteria($sProcessUID = '')
     {
-        $sDelimiter = DBAdapter::getStringDelimiter();
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
         $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C1.CON_VALUE');
-        $oCriteria->addAsColumn('INP_DOC_DESCRIPTION', 'C2.CON_VALUE');
-        $oCriteria->addAlias('C1', 'CONTENT');
-        $oCriteria->addAlias('C2', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C1.CON_ID' );
-        $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter );
-        $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C2.CON_ID' );
-        $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'INP_DOC_DESCRIPTION' . $sDelimiter );
-        $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
 
         $oDataset = InputDocumentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
@@ -3198,17 +3181,11 @@ class processMap
         $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_TYPE_OBJ);
         $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ);
         $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
         $aConditions = array();
         $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID);
         $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
         $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
         $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION);
@@ -3304,17 +3281,10 @@ class processMap
             $aUIDS[] = $aRow['STEP_UID_OBJ'];
             $oDataset->next();
         }
-        $sDelimiter = DBAdapter::getStringDelimiter();
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
         $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN);
         return $oCriteria;
@@ -4314,13 +4284,7 @@ class processMap
         }
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
         $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN);
         $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -5470,13 +5434,7 @@ class processMap
             }
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
             $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $sUIDs, Criteria::NOT_IN);
             $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -5956,26 +5914,13 @@ class processMap
     public function getExtInputDocumentsCriteria($start, $limit, $sProcessUID = '')
     {
         $aTasks = $this->getAllInputDocsByTask($sProcessUID);
-        $sDelimiter = DBAdapter::getStringDelimiter();
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
         $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_VERSIONING);
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESTINATION_PATH);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C1.CON_VALUE');
-        $oCriteria->addAsColumn('INP_DOC_DESCRIPTION', 'C2.CON_VALUE');
-        $oCriteria->addAlias('C1', 'CONTENT');
-        $oCriteria->addAlias('C2', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C1.CON_ID');
-        $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C1.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C2.CON_ID');
-        $aConditions[] = array('C2.CON_CATEGORY', $sDelimiter . 'INP_DOC_DESCRIPTION' . $sDelimiter);
-        $aConditions[] = array('C2.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
 
         $this->tmpCriteria = clone $oCriteria;
@@ -6454,17 +6399,11 @@ class processMap
         $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_UID_OBJ);
         $oCriteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
         $aConditions = array();
         $aConditions[] = array(StepSupervisorPeer::STEP_UID_OBJ, InputDocumentPeer::INP_DOC_UID);
         $aConditions[] = array(StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
         $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $oCriteria->add(StepSupervisorPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
         $oCriteria->addAscendingOrderByColumn(StepSupervisorPeer::STEP_POSITION);
@@ -6508,16 +6447,7 @@ class processMap
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
         $oCriteria->addSelectColumn(InputDocumentPeer::PRO_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID'
-        );
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter
-        );
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter
-        );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
         $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aUIDS, Criteria::NOT_IN);
         $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
@@ -6865,13 +6795,7 @@ class processMap
         }
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
         $oCriteria->add(InputDocumentPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(InputDocumentPeer::INP_DOC_UID, $aInputsUIDS, Criteria::NOT_IN);
         $oDataset = InputDocumentPeer::doSelectRS($oCriteria);
diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index d4b06eefe..c7af1178d 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -1935,7 +1935,7 @@ class Processes
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
                 $oInput = new InputDocument();
-                $aInput[] = $oInput->Load($aRow['INP_DOC_UID']);
+                $aInput[] = $oInput->load($aRow['INP_DOC_UID']);
                 $oDataset->next();
             }
             return $aInput;
diff --git a/workflow/engine/classes/model/InputDocument.php b/workflow/engine/classes/model/InputDocument.php
index d6004dd16..a998a8902 100755
--- a/workflow/engine/classes/model/InputDocument.php
+++ b/workflow/engine/classes/model/InputDocument.php
@@ -47,14 +47,14 @@ class InputDocument extends BaseInputDocument
      *
      * @var string
      */
-    protected $inp_doc_title = '';
+    protected $inp_doc_title_content = '';
 
     /**
      * This value goes in the content table
      *
      * @var string
      */
-    protected $inp_doc_description = '';
+    protected $inp_doc_description_content = '';
 
     /*
      * Load the application document registry
@@ -67,8 +67,6 @@ class InputDocument extends BaseInputDocument
             $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
             if (! is_null( $oInputDocument )) {
                 $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
-                $aFields['INP_DOC_TITLE'] = $oInputDocument->getInpDocTitle();
-                $aFields['INP_DOC_DESCRIPTION'] = $oInputDocument->getInpDocDescription();
                 $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
                 return $aFields;
             } else {
@@ -88,8 +86,6 @@ class InputDocument extends BaseInputDocument
             }
 
             $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
-            $aFields['INP_DOC_TITLE'] = $oInputDocument->getInpDocTitle();
-            $aFields['INP_DOC_DESCRIPTION'] = $oInputDocument->getInpDocDescription();
             $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
             return $aFields;
         } catch (Exception $oError) {
@@ -119,10 +115,10 @@ class InputDocument extends BaseInputDocument
             if ($oInputDocument->validate()) {
                 $oConnection->begin();
                 if (isset( $aData['INP_DOC_TITLE'] )) {
-                    $oInputDocument->setInpDocTitle( $aData['INP_DOC_TITLE'] );
+                    $oInputDocument->setInpDocTitleContent( $aData['INP_DOC_TITLE'] );
                 }
                 if (isset( $aData['INP_DOC_DESCRIPTION'] )) {
-                    $oInputDocument->setInpDocDescription( $aData['INP_DOC_DESCRIPTION'] );
+                    $oInputDocument->setInpDocDescriptionContent( $aData['INP_DOC_DESCRIPTION'] );
                 }
                 $iResult = $oInputDocument->save();
                 $oConnection->commit();
@@ -193,10 +189,10 @@ class InputDocument extends BaseInputDocument
                 if ($oInputDocument->validate()) {
                     $oConnection->begin();
                     if (isset( $aData['INP_DOC_TITLE'] )) {
-                        $oInputDocument->setInpDocTitle( $aData['INP_DOC_TITLE'] );
+                        $oInputDocument->setInpDocTitleContent( $aData['INP_DOC_TITLE'] );
                     }
                     if (isset( $aData['INP_DOC_DESCRIPTION'] )) {
-                        $oInputDocument->setInpDocDescription( $aData['INP_DOC_DESCRIPTION'] );
+                        $oInputDocument->setInpDocDescriptionContent( $aData['INP_DOC_DESCRIPTION'] );
                     }
                     $iResult = $oInputDocument->save();
                     $oConnection->commit();
@@ -266,16 +262,14 @@ class InputDocument extends BaseInputDocument
         try {
             $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
             if (! is_null( $oInputDocument )) {
-                $nameInput = $this->getInpDocTitle();
-                $descInput = $this->getInpDocDescription();
+                $nameInput = $oInputDocument->getInpDocTitle();
+                $descInput = $oInputDocument->getInpDocDescription();
                 $oConnection->begin();
                 Content::removeContent( 'INP_DOC_TITLE', '', $oInputDocument->getInpDocUid() );
                 Content::removeContent( 'INP_DOC_DESCRIPTION', '', $oInputDocument->getInpDocUid() );
                 $iResult = $oInputDocument->delete();
                 $oConnection->commit();
                 //Add Audit Log
-                $nameInput = $this->getInpDocTitle();
-                $descInput = $this->getInpDocDescription();                
                 G::auditLog("DeleteInputDocument", "Input Document Name: ".$nameInput.", Input Document Uid: ".$sInpDocUid.", Description: ".$descInput);
                 
                 return $iResult;
@@ -289,40 +283,40 @@ class InputDocument extends BaseInputDocument
     }
 
     /**
-     * Get the [inp_doc_title] column value.
+     * Get the [inp_doc_title_content] column value.
      *
      * @return string
      */
-    public function getInpDocTitle ()
+    public function getInpDocTitleContent ()
     {
-        if ($this->inp_doc_title == '') {
+        if ($this->inp_doc_title_content == '') {
             try {
-                $this->inp_doc_title = Content::load( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
+                $this->inp_doc_title_content = Content::load( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
             } catch (Exception $oError) {
                 throw ($oError);
             }
         }
-        return $this->inp_doc_title;
+        return $this->inp_doc_title_content;
     }
 
     /**
-     * Set the [inp_doc_title] column value.
+     * Set the [inp_doc_title_content] column value.
      *
      * @param string $sValue new value
      * @return void
      */
-    public function setInpDocTitle ($sValue)
+    public function setInpDocTitleContent ($sValue)
     {
         if ($sValue !== null && ! is_string( $sValue )) {
             $sValue = (string) $sValue;
         }
-        if ($this->inp_doc_title !== $sValue || $sValue === '') {
+        if ($this->inp_doc_title_content !== $sValue || $sValue === '') {
             try {
-                $this->inp_doc_title = $sValue;
+                $this->inp_doc_title_content = $sValue;
 
-                $iResult = Content::addContent( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_title );
+                $iResult = Content::addContent( 'INP_DOC_TITLE', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_title_content );
             } catch (Exception $oError) {
-                $this->inp_doc_title = '';
+                $this->inp_doc_title_content = '';
                 throw ($oError);
             }
         }
@@ -333,16 +327,16 @@ class InputDocument extends BaseInputDocument
      *
      * @return string
      */
-    public function getInpDocDescription ()
+    public function getInpDocDescriptionContent ()
     {
-        if ($this->inp_doc_description == '') {
+        if ($this->inp_doc_description_content == '') {
             try {
-                $this->inp_doc_description = Content::load( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
+                $this->inp_doc_description_content = Content::load( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en') );
             } catch (Exception $oError) {
                 throw ($oError);
             }
         }
-        return $this->inp_doc_description;
+        return $this->inp_doc_description_content;
     }
 
     /**
@@ -351,18 +345,18 @@ class InputDocument extends BaseInputDocument
      * @param string $sValue new value
      * @return void
      */
-    public function setInpDocDescription ($sValue)
+    public function setInpDocDescriptionContent ($sValue)
     {
         if ($sValue !== null && ! is_string( $sValue )) {
             $sValue = (string) $sValue;
         }
-        if ($this->inp_doc_description !== $sValue || $sValue === '') {
+        if ($this->inp_doc_description_content !== $sValue || $sValue === '') {
             try {
-                $this->inp_doc_description = $sValue;
+                $this->inp_doc_description_content = $sValue;
 
-                $iResult = Content::addContent( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_description );
+                $iResult = Content::addContent( 'INP_DOC_DESCRIPTION', '', $this->getInpDocUid(), (defined( 'SYS_LANG' ) ? SYS_LANG : 'en'), $this->inp_doc_description_content );
             } catch (Exception $oError) {
-                $this->inp_doc_description = '';
+                $this->inp_doc_description_content = '';
                 throw ($oError);
             }
         }
diff --git a/workflow/engine/classes/model/map/InputDocumentMapBuilder.php b/workflow/engine/classes/model/map/InputDocumentMapBuilder.php
index a1c7f24d0..ea06c2f99 100755
--- a/workflow/engine/classes/model/map/InputDocumentMapBuilder.php
+++ b/workflow/engine/classes/model/map/InputDocumentMapBuilder.php
@@ -69,6 +69,10 @@ class InputDocumentMapBuilder
 
         $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('INP_DOC_TITLE', 'InpDocTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
+        $tMap->addColumn('INP_DOC_DESCRIPTION', 'InpDocDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
         $tMap->addColumn('INP_DOC_FORM_NEEDED', 'InpDocFormNeeded', 'string', CreoleTypes::VARCHAR, true, 20);
 
         $tMap->addColumn('INP_DOC_ORIGINAL', 'InpDocOriginal', 'string', CreoleTypes::VARCHAR, true, 20);
diff --git a/workflow/engine/classes/model/om/BaseInputDocument.php b/workflow/engine/classes/model/om/BaseInputDocument.php
index eeb198bd5..cca5213c6 100755
--- a/workflow/engine/classes/model/om/BaseInputDocument.php
+++ b/workflow/engine/classes/model/om/BaseInputDocument.php
@@ -39,6 +39,18 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
      */
     protected $pro_uid = '0';
 
+    /**
+     * The value for the inp_doc_title field.
+     * @var        string
+     */
+    protected $inp_doc_title;
+
+    /**
+     * The value for the inp_doc_description field.
+     * @var        string
+     */
+    protected $inp_doc_description;
+
     /**
      * The value for the inp_doc_form_needed field.
      * @var        string
@@ -129,6 +141,28 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
         return $this->pro_uid;
     }
 
+    /**
+     * Get the [inp_doc_title] column value.
+     * 
+     * @return     string
+     */
+    public function getInpDocTitle()
+    {
+
+        return $this->inp_doc_title;
+    }
+
+    /**
+     * Get the [inp_doc_description] column value.
+     * 
+     * @return     string
+     */
+    public function getInpDocDescription()
+    {
+
+        return $this->inp_doc_description;
+    }
+
     /**
      * Get the [inp_doc_form_needed] column value.
      * 
@@ -272,6 +306,50 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
 
     } // setProUid()
 
+    /**
+     * Set the value of [inp_doc_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setInpDocTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->inp_doc_title !== $v) {
+            $this->inp_doc_title = $v;
+            $this->modifiedColumns[] = InputDocumentPeer::INP_DOC_TITLE;
+        }
+
+    } // setInpDocTitle()
+
+    /**
+     * Set the value of [inp_doc_description] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setInpDocDescription($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->inp_doc_description !== $v) {
+            $this->inp_doc_description = $v;
+            $this->modifiedColumns[] = InputDocumentPeer::INP_DOC_DESCRIPTION;
+        }
+
+    } // setInpDocDescription()
+
     /**
      * Set the value of [inp_doc_form_needed] column.
      * 
@@ -491,30 +569,34 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
 
             $this->pro_uid = $rs->getString($startcol + 1);
 
-            $this->inp_doc_form_needed = $rs->getString($startcol + 2);
+            $this->inp_doc_title = $rs->getString($startcol + 2);
 
-            $this->inp_doc_original = $rs->getString($startcol + 3);
+            $this->inp_doc_description = $rs->getString($startcol + 3);
 
-            $this->inp_doc_published = $rs->getString($startcol + 4);
+            $this->inp_doc_form_needed = $rs->getString($startcol + 4);
 
-            $this->inp_doc_versioning = $rs->getInt($startcol + 5);
+            $this->inp_doc_original = $rs->getString($startcol + 5);
 
-            $this->inp_doc_destination_path = $rs->getString($startcol + 6);
+            $this->inp_doc_published = $rs->getString($startcol + 6);
 
-            $this->inp_doc_tags = $rs->getString($startcol + 7);
+            $this->inp_doc_versioning = $rs->getInt($startcol + 7);
 
-            $this->inp_doc_type_file = $rs->getString($startcol + 8);
+            $this->inp_doc_destination_path = $rs->getString($startcol + 8);
 
-            $this->inp_doc_max_filesize = $rs->getInt($startcol + 9);
+            $this->inp_doc_tags = $rs->getString($startcol + 9);
 
-            $this->inp_doc_max_filesize_unit = $rs->getString($startcol + 10);
+            $this->inp_doc_type_file = $rs->getString($startcol + 10);
+
+            $this->inp_doc_max_filesize = $rs->getInt($startcol + 11);
+
+            $this->inp_doc_max_filesize_unit = $rs->getString($startcol + 12);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 11; // 11 = InputDocumentPeer::NUM_COLUMNS - InputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 13; // 13 = InputDocumentPeer::NUM_COLUMNS - InputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating InputDocument object", $e);
@@ -725,30 +807,36 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
                 return $this->getProUid();
                 break;
             case 2:
-                return $this->getInpDocFormNeeded();
+                return $this->getInpDocTitle();
                 break;
             case 3:
-                return $this->getInpDocOriginal();
+                return $this->getInpDocDescription();
                 break;
             case 4:
-                return $this->getInpDocPublished();
+                return $this->getInpDocFormNeeded();
                 break;
             case 5:
-                return $this->getInpDocVersioning();
+                return $this->getInpDocOriginal();
                 break;
             case 6:
-                return $this->getInpDocDestinationPath();
+                return $this->getInpDocPublished();
                 break;
             case 7:
-                return $this->getInpDocTags();
+                return $this->getInpDocVersioning();
                 break;
             case 8:
-                return $this->getInpDocTypeFile();
+                return $this->getInpDocDestinationPath();
                 break;
             case 9:
-                return $this->getInpDocMaxFilesize();
+                return $this->getInpDocTags();
                 break;
             case 10:
+                return $this->getInpDocTypeFile();
+                break;
+            case 11:
+                return $this->getInpDocMaxFilesize();
+                break;
+            case 12:
                 return $this->getInpDocMaxFilesizeUnit();
                 break;
             default:
@@ -773,15 +861,17 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
         $result = array(
             $keys[0] => $this->getInpDocUid(),
             $keys[1] => $this->getProUid(),
-            $keys[2] => $this->getInpDocFormNeeded(),
-            $keys[3] => $this->getInpDocOriginal(),
-            $keys[4] => $this->getInpDocPublished(),
-            $keys[5] => $this->getInpDocVersioning(),
-            $keys[6] => $this->getInpDocDestinationPath(),
-            $keys[7] => $this->getInpDocTags(),
-            $keys[8] => $this->getInpDocTypeFile(),
-            $keys[9] => $this->getInpDocMaxFilesize(),
-            $keys[10] => $this->getInpDocMaxFilesizeUnit(),
+            $keys[2] => $this->getInpDocTitle(),
+            $keys[3] => $this->getInpDocDescription(),
+            $keys[4] => $this->getInpDocFormNeeded(),
+            $keys[5] => $this->getInpDocOriginal(),
+            $keys[6] => $this->getInpDocPublished(),
+            $keys[7] => $this->getInpDocVersioning(),
+            $keys[8] => $this->getInpDocDestinationPath(),
+            $keys[9] => $this->getInpDocTags(),
+            $keys[10] => $this->getInpDocTypeFile(),
+            $keys[11] => $this->getInpDocMaxFilesize(),
+            $keys[12] => $this->getInpDocMaxFilesizeUnit(),
         );
         return $result;
     }
@@ -820,30 +910,36 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
                 $this->setProUid($value);
                 break;
             case 2:
-                $this->setInpDocFormNeeded($value);
+                $this->setInpDocTitle($value);
                 break;
             case 3:
-                $this->setInpDocOriginal($value);
+                $this->setInpDocDescription($value);
                 break;
             case 4:
-                $this->setInpDocPublished($value);
+                $this->setInpDocFormNeeded($value);
                 break;
             case 5:
-                $this->setInpDocVersioning($value);
+                $this->setInpDocOriginal($value);
                 break;
             case 6:
-                $this->setInpDocDestinationPath($value);
+                $this->setInpDocPublished($value);
                 break;
             case 7:
-                $this->setInpDocTags($value);
+                $this->setInpDocVersioning($value);
                 break;
             case 8:
-                $this->setInpDocTypeFile($value);
+                $this->setInpDocDestinationPath($value);
                 break;
             case 9:
-                $this->setInpDocMaxFilesize($value);
+                $this->setInpDocTags($value);
                 break;
             case 10:
+                $this->setInpDocTypeFile($value);
+                break;
+            case 11:
+                $this->setInpDocMaxFilesize($value);
+                break;
+            case 12:
                 $this->setInpDocMaxFilesizeUnit($value);
                 break;
         } // switch()
@@ -878,39 +974,47 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setInpDocFormNeeded($arr[$keys[2]]);
+            $this->setInpDocTitle($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setInpDocOriginal($arr[$keys[3]]);
+            $this->setInpDocDescription($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setInpDocPublished($arr[$keys[4]]);
+            $this->setInpDocFormNeeded($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setInpDocVersioning($arr[$keys[5]]);
+            $this->setInpDocOriginal($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setInpDocDestinationPath($arr[$keys[6]]);
+            $this->setInpDocPublished($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setInpDocTags($arr[$keys[7]]);
+            $this->setInpDocVersioning($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setInpDocTypeFile($arr[$keys[8]]);
+            $this->setInpDocDestinationPath($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setInpDocMaxFilesize($arr[$keys[9]]);
+            $this->setInpDocTags($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setInpDocMaxFilesizeUnit($arr[$keys[10]]);
+            $this->setInpDocTypeFile($arr[$keys[10]]);
+        }
+
+        if (array_key_exists($keys[11], $arr)) {
+            $this->setInpDocMaxFilesize($arr[$keys[11]]);
+        }
+
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setInpDocMaxFilesizeUnit($arr[$keys[12]]);
         }
 
     }
@@ -932,6 +1036,14 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
             $criteria->add(InputDocumentPeer::PRO_UID, $this->pro_uid);
         }
 
+        if ($this->isColumnModified(InputDocumentPeer::INP_DOC_TITLE)) {
+            $criteria->add(InputDocumentPeer::INP_DOC_TITLE, $this->inp_doc_title);
+        }
+
+        if ($this->isColumnModified(InputDocumentPeer::INP_DOC_DESCRIPTION)) {
+            $criteria->add(InputDocumentPeer::INP_DOC_DESCRIPTION, $this->inp_doc_description);
+        }
+
         if ($this->isColumnModified(InputDocumentPeer::INP_DOC_FORM_NEEDED)) {
             $criteria->add(InputDocumentPeer::INP_DOC_FORM_NEEDED, $this->inp_doc_form_needed);
         }
@@ -1024,6 +1136,10 @@ abstract class BaseInputDocument extends BaseObject implements Persistent
 
         $copyObj->setProUid($this->pro_uid);
 
+        $copyObj->setInpDocTitle($this->inp_doc_title);
+
+        $copyObj->setInpDocDescription($this->inp_doc_description);
+
         $copyObj->setInpDocFormNeeded($this->inp_doc_form_needed);
 
         $copyObj->setInpDocOriginal($this->inp_doc_original);
diff --git a/workflow/engine/classes/model/om/BaseInputDocumentPeer.php b/workflow/engine/classes/model/om/BaseInputDocumentPeer.php
index 525675f1a..ef974df97 100755
--- a/workflow/engine/classes/model/om/BaseInputDocumentPeer.php
+++ b/workflow/engine/classes/model/om/BaseInputDocumentPeer.php
@@ -25,7 +25,7 @@ abstract class BaseInputDocumentPeer
     const CLASS_DEFAULT = 'classes.model.InputDocument';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 11;
+    const NUM_COLUMNS = 13;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,12 @@ abstract class BaseInputDocumentPeer
     /** the column name for the PRO_UID field */
     const PRO_UID = 'INPUT_DOCUMENT.PRO_UID';
 
+    /** the column name for the INP_DOC_TITLE field */
+    const INP_DOC_TITLE = 'INPUT_DOCUMENT.INP_DOC_TITLE';
+
+    /** the column name for the INP_DOC_DESCRIPTION field */
+    const INP_DOC_DESCRIPTION = 'INPUT_DOCUMENT.INP_DOC_DESCRIPTION';
+
     /** the column name for the INP_DOC_FORM_NEEDED field */
     const INP_DOC_FORM_NEEDED = 'INPUT_DOCUMENT.INP_DOC_FORM_NEEDED';
 
@@ -75,10 +81,10 @@ abstract class BaseInputDocumentPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('InpDocUid', 'ProUid', 'InpDocFormNeeded', 'InpDocOriginal', 'InpDocPublished', 'InpDocVersioning', 'InpDocDestinationPath', 'InpDocTags', 'InpDocTypeFile', 'InpDocMaxFilesize', 'InpDocMaxFilesizeUnit', ),
-        BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID, InputDocumentPeer::PRO_UID, InputDocumentPeer::INP_DOC_FORM_NEEDED, InputDocumentPeer::INP_DOC_ORIGINAL, InputDocumentPeer::INP_DOC_PUBLISHED, InputDocumentPeer::INP_DOC_VERSIONING, InputDocumentPeer::INP_DOC_DESTINATION_PATH, InputDocumentPeer::INP_DOC_TAGS, InputDocumentPeer::INP_DOC_TYPE_FILE, InputDocumentPeer::INP_DOC_MAX_FILESIZE, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT, ),
-        BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID', 'PRO_UID', 'INP_DOC_FORM_NEEDED', 'INP_DOC_ORIGINAL', 'INP_DOC_PUBLISHED', 'INP_DOC_VERSIONING', 'INP_DOC_DESTINATION_PATH', 'INP_DOC_TAGS', 'INP_DOC_TYPE_FILE', 'INP_DOC_MAX_FILESIZE', 'INP_DOC_MAX_FILESIZE_UNIT', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
+        BasePeer::TYPE_PHPNAME => array ('InpDocUid', 'ProUid', 'InpDocTitle', 'InpDocDescription', 'InpDocFormNeeded', 'InpDocOriginal', 'InpDocPublished', 'InpDocVersioning', 'InpDocDestinationPath', 'InpDocTags', 'InpDocTypeFile', 'InpDocMaxFilesize', 'InpDocMaxFilesizeUnit', ),
+        BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID, InputDocumentPeer::PRO_UID, InputDocumentPeer::INP_DOC_TITLE, InputDocumentPeer::INP_DOC_DESCRIPTION, InputDocumentPeer::INP_DOC_FORM_NEEDED, InputDocumentPeer::INP_DOC_ORIGINAL, InputDocumentPeer::INP_DOC_PUBLISHED, InputDocumentPeer::INP_DOC_VERSIONING, InputDocumentPeer::INP_DOC_DESTINATION_PATH, InputDocumentPeer::INP_DOC_TAGS, InputDocumentPeer::INP_DOC_TYPE_FILE, InputDocumentPeer::INP_DOC_MAX_FILESIZE, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT, ),
+        BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID', 'PRO_UID', 'INP_DOC_TITLE', 'INP_DOC_DESCRIPTION', 'INP_DOC_FORM_NEEDED', 'INP_DOC_ORIGINAL', 'INP_DOC_PUBLISHED', 'INP_DOC_VERSIONING', 'INP_DOC_DESTINATION_PATH', 'INP_DOC_TAGS', 'INP_DOC_TYPE_FILE', 'INP_DOC_MAX_FILESIZE', 'INP_DOC_MAX_FILESIZE_UNIT', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
     );
 
     /**
@@ -88,10 +94,10 @@ abstract class BaseInputDocumentPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('InpDocUid' => 0, 'ProUid' => 1, 'InpDocFormNeeded' => 2, 'InpDocOriginal' => 3, 'InpDocPublished' => 4, 'InpDocVersioning' => 5, 'InpDocDestinationPath' => 6, 'InpDocTags' => 7, 'InpDocTypeFile' => 8, 'InpDocMaxFilesize' => 9, 'InpDocMaxFilesizeUnit' => 10, ),
-        BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID => 0, InputDocumentPeer::PRO_UID => 1, InputDocumentPeer::INP_DOC_FORM_NEEDED => 2, InputDocumentPeer::INP_DOC_ORIGINAL => 3, InputDocumentPeer::INP_DOC_PUBLISHED => 4, InputDocumentPeer::INP_DOC_VERSIONING => 5, InputDocumentPeer::INP_DOC_DESTINATION_PATH => 6, InputDocumentPeer::INP_DOC_TAGS => 7, InputDocumentPeer::INP_DOC_TYPE_FILE => 8, InputDocumentPeer::INP_DOC_MAX_FILESIZE => 9, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT => 10, ),
-        BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID' => 0, 'PRO_UID' => 1, 'INP_DOC_FORM_NEEDED' => 2, 'INP_DOC_ORIGINAL' => 3, 'INP_DOC_PUBLISHED' => 4, 'INP_DOC_VERSIONING' => 5, 'INP_DOC_DESTINATION_PATH' => 6, 'INP_DOC_TAGS' => 7, 'INP_DOC_TYPE_FILE' => 8, 'INP_DOC_MAX_FILESIZE' => 9, 'INP_DOC_MAX_FILESIZE_UNIT' => 10, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
+        BasePeer::TYPE_PHPNAME => array ('InpDocUid' => 0, 'ProUid' => 1, 'InpDocTitle' => 2, 'InpDocDescription' => 3, 'InpDocFormNeeded' => 4, 'InpDocOriginal' => 5, 'InpDocPublished' => 6, 'InpDocVersioning' => 7, 'InpDocDestinationPath' => 8, 'InpDocTags' => 9, 'InpDocTypeFile' => 10, 'InpDocMaxFilesize' => 11, 'InpDocMaxFilesizeUnit' => 12, ),
+        BasePeer::TYPE_COLNAME => array (InputDocumentPeer::INP_DOC_UID => 0, InputDocumentPeer::PRO_UID => 1, InputDocumentPeer::INP_DOC_TITLE => 2, InputDocumentPeer::INP_DOC_DESCRIPTION => 3, InputDocumentPeer::INP_DOC_FORM_NEEDED => 4, InputDocumentPeer::INP_DOC_ORIGINAL => 5, InputDocumentPeer::INP_DOC_PUBLISHED => 6, InputDocumentPeer::INP_DOC_VERSIONING => 7, InputDocumentPeer::INP_DOC_DESTINATION_PATH => 8, InputDocumentPeer::INP_DOC_TAGS => 9, InputDocumentPeer::INP_DOC_TYPE_FILE => 10, InputDocumentPeer::INP_DOC_MAX_FILESIZE => 11, InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT => 12, ),
+        BasePeer::TYPE_FIELDNAME => array ('INP_DOC_UID' => 0, 'PRO_UID' => 1, 'INP_DOC_TITLE' => 2, 'INP_DOC_DESCRIPTION' => 3, 'INP_DOC_FORM_NEEDED' => 4, 'INP_DOC_ORIGINAL' => 5, 'INP_DOC_PUBLISHED' => 6, 'INP_DOC_VERSIONING' => 7, 'INP_DOC_DESTINATION_PATH' => 8, 'INP_DOC_TAGS' => 9, 'INP_DOC_TYPE_FILE' => 10, 'INP_DOC_MAX_FILESIZE' => 11, 'INP_DOC_MAX_FILESIZE_UNIT' => 12, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
     );
 
     /**
@@ -196,6 +202,10 @@ abstract class BaseInputDocumentPeer
 
         $criteria->addSelectColumn(InputDocumentPeer::PRO_UID);
 
+        $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_TITLE);
+
+        $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_DESCRIPTION);
+
         $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_FORM_NEEDED);
 
         $criteria->addSelectColumn(InputDocumentPeer::INP_DOC_ORIGINAL);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 07724680b..446dd72b4 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -621,6 +621,8 @@
     </vendor>
     <column name="INP_DOC_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" default="0"/>
+    <column name="INP_DOC_TITLE" type="LONGVARCHAR" required="true"/>
+    <column name="INP_DOC_DESCRIPTION" type="LONGVARCHAR"/>
     <column name="INP_DOC_FORM_NEEDED" type="VARCHAR" size="20" required="true" default="REAL"/>
     <column name="INP_DOC_ORIGINAL" type="VARCHAR" size="20" required="true" default="COPY"/>
     <column name="INP_DOC_PUBLISHED" type="VARCHAR" size="20" required="true" default="PRIVATE"/>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 30681a5c0..7b446b9cd 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -288,6 +288,8 @@ CREATE TABLE `INPUT_DOCUMENT`
 (
 	`INP_DOC_UID` VARCHAR(32) default '' NOT NULL,
 	`PRO_UID` VARCHAR(32) default '0' NOT NULL,
+	`INP_DOC_TITLE` MEDIUMTEXT  NOT NULL,
+	`INP_DOC_DESCRIPTION` MEDIUMTEXT,
 	`INP_DOC_FORM_NEEDED` VARCHAR(20) default 'REAL' NOT NULL,
 	`INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL,
 	`INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL,
diff --git a/workflow/engine/methods/inputdocs/inputdocs_Save.php b/workflow/engine/methods/inputdocs/inputdocs_Save.php
index 8bda6c71c..d2b3d1c79 100755
--- a/workflow/engine/methods/inputdocs/inputdocs_Save.php
+++ b/workflow/engine/methods/inputdocs/inputdocs_Save.php
@@ -54,26 +54,14 @@ try {
             $oCriteria = new Criteria( 'workflow' );
             $oCriteria->addSelectColumn( InputDocumentPeer::INP_DOC_UID );
             $oCriteria->add( InputDocumentPeer::PRO_UID, $sPRO_UID );
+            $oCriteria->add( InputDocumentPeer::INP_DOC_TITLE, $snameInput );
             $oDataset = InputDocumentPeer::doSelectRS( $oCriteria );
             $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
             $flag = true;
-            while ($oDataset->next() && $flag) {
-                $aRow = $oDataset->getRow();
-
-                $oCriteria1 = new Criteria( 'workflow' );
-                $oCriteria1->addSelectColumn( 'COUNT(*) AS INPUTS' );
-                $oCriteria1->add( ContentPeer::CON_CATEGORY, 'INP_DOC_TITLE' );
-                $oCriteria1->add( ContentPeer::CON_ID, $aRow['INP_DOC_UID'] );
-                $oCriteria1->add( ContentPeer::CON_VALUE, $snameInput );
-                $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
-                $oDataset1 = ContentPeer::doSelectRS( $oCriteria1 );
-                $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-                $oDataset1->next();
-                $aRow1 = $oDataset1->getRow();
-
-                if ($aRow1['INPUTS']) {
-                    $flag = false;
-                }
+            $oDataset->next();
+            $aRow = $oDataset->getRow();
+            if ($aRow) {
+                $flag = false;
             }
             print $flag;
             break;
@@ -88,16 +76,16 @@ try {
                 $aData = $_POST;
             }
 
-            //Validating the format of the allowed extentions
+            //Validating the format of the allowed extentions
             //Allowed Types has to have this format -> *.pdf, .xls, *.docx, *.*  or .* to all.
-            $allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']);
-            foreach ($allowedTypes as $types => $val) {
+            $allowedTypes = explode(", ", $aData['INP_DOC_TYPE_FILE']);
+            foreach ($allowedTypes as $types => $val) {
             	if ((preg_match("/^.*\.?[a-zA-Z0-9]{2,15}$/", $val)) || ($val == "*.*") || ($val == ".*")) {
-            	}else {
-            		$message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' );
-            		G::SendMessageText( $message, "ERROR" );
-            		die();
-            	}
+            	}else {
+            		$message = G::LoadTranslation( 'ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT' );
+            		G::SendMessageText( $message, "ERROR" );
+            		die();
+            	}
             }
 
             if ($aData['INP_DOC_UID'] == '') {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php b/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php
index 6c6b9ab6e..04dfe49e5 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/CaseTracker.php
@@ -200,24 +200,8 @@ class CaseTracker
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
-            $criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE");
-            $criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE");
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-            $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
             $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
             $criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayInputDocumentUid, \Criteria::NOT_IN);
 
@@ -229,7 +213,9 @@ class CaseTracker
 
                 if ($row["INP_DOC_TITLE"] . "" == "") {
                     //There is no transaltion for this Document name, try to get/regenerate the label
-                    $row["INP_DOC_TITLE"] = \Content::Load("INP_DOC_TITLE", "", $row["INP_DOC_UID"], SYS_LANG);
+                    $inputDocument = new \InputDocument();
+                    $inputDocumentObj = $inputDocument->load($row['INP_DOC_UID']);
+                    $row["INP_DOC_TITLE"] = $inputDocumentObj['INP_DOC_TITLE'];
                 }
 
                 $arrayCaseTrackerObject[] = array(
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
index 10060aa48..5afe47af8 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
@@ -110,22 +110,14 @@ class InputDocument
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
 
             if ($inputDocumentUidExclude != "") {
                 $criteria->add(\InputDocumentPeer::INP_DOC_UID, $inputDocumentUidExclude, \Criteria::NOT_EQUAL);
             }
 
-            $criteria->add("CT.CON_VALUE", $inputDocumentTitle, \Criteria::EQUAL);
+            $criteria->add(\InputDocumentPeer::INP_DOC_TITLE, $inputDocumentTitle, \Criteria::EQUAL);
 
             $rsCriteria = \InputDocumentPeer::doSelectRS($criteria);
 
@@ -461,13 +453,11 @@ class InputDocument
     public function getInputDocumentCriteria()
     {
         try {
-            $delimiter = \DBAdapter::getStringDelimiter();
-
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
-            $criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE");
-            $criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE");
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_FORM_NEEDED);
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_ORIGINAL);
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_PUBLISHED);
@@ -477,22 +467,6 @@ class InputDocument
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TYPE_FILE);
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE);
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_MAX_FILESIZE_UNIT);
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-            $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
             return $criteria;
         } catch (\Exception $e) {
             throw $e;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
index 322b23b83..c8f2ea000 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
@@ -1456,7 +1456,7 @@ class Process
             $criteria = $inputDocument->getInputDocumentCriteria();
 
             $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
-            $criteria->addAscendingOrderByColumn("INP_DOC_TITLE");
+            $criteria->addAscendingOrderByColumn(\InputDocumentPeer::INP_DOC_TITLE);
 
             $rsCriteria = \InputDocumentPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
index 5f99b63f1..d99187554 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
@@ -643,13 +643,7 @@ class ProcessSupervisor
             $oCriteria = new \Criteria('workflow');
             $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
             $oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN);
             $oDataset = \StepSupervisorPeer::doSelectRS($oCriteria);
@@ -722,17 +716,11 @@ class ProcessSupervisor
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
+            $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $aConditions = array();
             $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
             $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
             $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
-            $aConditions = array();
-            $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
             $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
             $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION);
@@ -823,17 +811,11 @@ class ProcessSupervisor
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
+            $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $aConditions = array();
             $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
             $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
             $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
-            $aConditions = array();
-            $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
             $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
             $oCriteria->addAscendingOrderByColumn(\StepSupervisorPeer::STEP_POSITION);
@@ -878,17 +860,11 @@ class ProcessSupervisor
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
+            $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $aConditions = array();
             $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
             $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
             $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
-            $aConditions = array();
-            $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
             $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\StepSupervisorPeer::STEP_UID, $sPuiUID);
             $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
@@ -926,17 +902,10 @@ class ProcessSupervisor
             foreach ($oCriteria as $oCriteria => $value) {
                 $aUIDS[] = $value["input_doc_uid"];
             }
-            $sDelimiter = \DBAdapter::getStringDelimiter();
             $oCriteria = new \Criteria('workflow');
             $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
             $oCriteria->addSelectColumn(\InputDocumentPeer::PRO_UID);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
-            $aConditions = array();
-            $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
+            $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $oCriteria->add(\InputDocumentPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\InputDocumentPeer::INP_DOC_UID, $aUIDS, \Criteria::NOT_IN);
             $oDataset = \StepSupervisorPeer::doSelectRS($oCriteria);
@@ -1138,17 +1107,11 @@ class ProcessSupervisor
         $sDelimiter = \DBAdapter::getStringDelimiter();
         $oCriteria = new \Criteria('workflow');
         $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID);
-        $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-        $oCriteria->addAlias('C', 'CONTENT');
+        $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
         $aConditions = array();
         $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
         $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
         $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
-        $aConditions = array();
-        $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-        $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-        $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-        $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
         $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
         $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID);
         $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
@@ -1173,17 +1136,11 @@ class ProcessSupervisor
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_TYPE_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_UID_OBJ);
             $oCriteria->addSelectColumn(\StepSupervisorPeer::STEP_POSITION);
-            $oCriteria->addAsColumn('INP_DOC_TITLE', 'C.CON_VALUE');
-            $oCriteria->addAlias('C', 'CONTENT');
+            $oCriteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
             $aConditions = array();
             $aConditions[] = array(\StepSupervisorPeer::STEP_UID_OBJ, \InputDocumentPeer::INP_DOC_UID);
             $aConditions[] = array(\StepSupervisorPeer::STEP_TYPE_OBJ, $sDelimiter . 'INPUT_DOCUMENT' . $sDelimiter);
             $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
-            $aConditions = array();
-            $aConditions[] = array(\InputDocumentPeer::INP_DOC_UID, 'C.CON_ID');
-            $aConditions[] = array('C.CON_CATEGORY', $sDelimiter . 'INP_DOC_TITLE' . $sDelimiter);
-            $aConditions[] = array('C.CON_LANG', $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, \Criteria::LEFT_JOIN);
             $oCriteria->add(\StepSupervisorPeer::PRO_UID, $sProcessUID);
             $oCriteria->add(\StepSupervisorPeer::STEP_UID_OBJ, $sInputDocumentUID);
             $oCriteria->add(\StepSupervisorPeer::STEP_TYPE_OBJ, 'INPUT_DOCUMENT');
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index 1e8fbb876..bcf2cb74a 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -574,24 +574,8 @@ class Task
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
-            $criteria->addAsColumn("INP_DOC_TITLE", "CT.CON_VALUE");
-            $criteria->addAsColumn("INP_DOC_DESCRIPTION", "CD.CON_VALUE");
-
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-            $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "INP_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CD.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "INP_DOC_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TITLE);
+            $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESCRIPTION);
             $criteria->add(\InputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
             $criteria->add(\InputDocumentPeer::INP_DOC_UID, $arrayUid, \Criteria::NOT_IN);
 
@@ -603,7 +587,9 @@ class Task
 
                 if ($row["INP_DOC_TITLE"] . "" == "") {
                     //There is no transaltion for this Document name, try to get/regenerate the label
-                    $row["INP_DOC_TITLE"] = \Content::Load("INP_DOC_TITLE", "", $row["INP_DOC_UID"], SYS_LANG);
+                    $oInputDocument = new \InputDocument;
+                    $aRow = $oInputDocument->load($row['INP_DOC_UID']);
+                    $row['INP_DOC_TITLE'] = $aRow['INP_DOC_TITLE'];
                 }
 
                 $arraydbStep[] = array(

From c2dd9856911441d7d664d2309597c0b776be07b6 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Fri, 1 Jul 2016 10:01:42 -0400
Subject: [PATCH 10/16] upgrade branch

---
 workflow/engine/classes/model/InputDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/model/InputDocument.php b/workflow/engine/classes/model/InputDocument.php
index a998a8902..2987077ed 100755
--- a/workflow/engine/classes/model/InputDocument.php
+++ b/workflow/engine/classes/model/InputDocument.php
@@ -67,7 +67,7 @@ class InputDocument extends BaseInputDocument
             $oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
             if (! is_null( $oInputDocument )) {
                 $aFields = $oInputDocument->toArray( BasePeer::TYPE_FIELDNAME );
-                $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
+                $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
                 return $aFields;
             } else {
                 throw (new Exception( 'This row doesn\'t exist!' ));

From 8eaeb5e279f43df0a9aa093919b92ae158364af5 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Tue, 28 Jun 2016 10:59:43 -0400
Subject: [PATCH 11/16] HOR-1328 Agregar los campos que se guardan en la tabla
 CONTENT relacionados a la tabla TASK

pmfunction change content by task

remove lang in pmfunction

add languaje by compatibility
---
 workflow/engine/classes/class.case.php        | 219 ++---
 workflow/engine/classes/class.pmFunctions.php |  16 +-
 workflow/engine/classes/class.processMap.php  |  87 +-
 workflow/engine/classes/class.report.php      |  32 +-
 workflow/engine/classes/class.tasks.php       |  14 +-
 workflow/engine/classes/class.wsBase.php      |  38 +-
 workflow/engine/classes/model/Task.php        | 189 ++--
 .../classes/model/map/TaskMapBuilder.php      |  14 +
 workflow/engine/classes/model/om/BaseTask.php | 854 +++++++++++++-----
 .../engine/classes/model/om/BaseTaskPeer.php  |  53 +-
 workflow/engine/config/schema.xml             |   9 +
 workflow/engine/data/mysql/schema.sql         |   7 +
 .../cases/casesConsolidatedListExtJs.php      |   4 +-
 .../methods/cases/casesStartPage_Ajax.php     |  23 +-
 .../engine/methods/tracker/tracker_Ajax.php   |  18 +-
 .../src/ProcessMaker/BusinessModel/Cases.php  |  55 +-
 .../src/ProcessMaker/BusinessModel/Light.php  |  43 +-
 17 files changed, 938 insertions(+), 737 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 9f2e6e382..113d054d7 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -199,23 +199,13 @@ class Cases
 
         $c = new Criteria();
         $c->addSelectColumn(TaskPeer::TAS_UID);
+        $c->addSelectColumn(TaskPeer::TAS_TITLE);
         $c->addSelectColumn(TaskPeer::PRO_UID);
         $c->addSelectColumn(ProcessPeer::PRO_TITLE);
-        $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-        $c->addAlias('C1', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
-        $aConditions[] = array(
-            'C1.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $aConditions[] = array(
-            'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
         $c->addAscendingOrderByColumn('PRO_TITLE');
-        $c->addAscendingOrderByColumn('TAS_TITLE');
+        $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $rs->next();
@@ -294,10 +284,9 @@ class Cases
 
         $c = new Criteria();
         $c->addSelectColumn(TaskPeer::TAS_UID);
+        $c->addSelectColumn(TaskPeer::TAS_TITLE);
         $c->addSelectColumn(TaskPeer::PRO_UID);
         $c->addSelectColumn(ProcessPeer::PRO_TITLE);
-        $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-        $c->addAlias('C1', 'CONTENT');
         if ($typeView == 'category') {
             $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
             $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
@@ -311,15 +300,6 @@ class Cases
             $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         }
 
-        $aConditions = array();
-        $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
-        $aConditions[] = array(
-            'C1.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $aConditions[] = array(
-            'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
 
@@ -428,19 +408,9 @@ class Cases
 
         $c = new Criteria();
         $c->addSelectColumn(TaskPeer::TAS_UID);
+        $c->addSelectColumn(TaskPeer::TAS_TITLE);
         $c->addSelectColumn(TaskPeer::PRO_UID);
         $c->addSelectColumn(ProcessPeer::PRO_TITLE);
-        $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-        $c->addAlias('C1', 'CONTENT');
-        $aConditions = array();
-        $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
-        $aConditions[] = array(
-            'C1.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $aConditions[] = array(
-            'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
         $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
         $c->addAscendingOrderByColumn('PRO_TITLE');
@@ -722,35 +692,23 @@ class Cases
         for ($r = count($currentDelegations) - 1; $r >= 0; $r--) {
             $c = new Criteria();
             $c->clearSelectColumns();
-            $c->addSelectColumn(ContentPeer::CON_CATEGORY);
-            $c->addSelectColumn(ContentPeer::CON_VALUE);
-            $c->add(ContentPeer::CON_ID, $currentDelegations[$r]->getTasUid());
-            $c->add(ContentPeer::CON_LANG, $lang);
+            $c->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
+            $c->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
+            $c->add(TaskPeer::TAS_UID, $currentDelegations[$r]->getTasUid());
             $rs = TaskPeer::doSelectRS($c);
             $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-            $rs->next();
-            $row = $rs->getRow();
-
-            while (is_array($row)) {
-                switch ($row['CON_CATEGORY']) {
-                    case 'TAS_DEF_TITLE':
-                        $tasDefTitle = $row['CON_VALUE'];
-                        if ($tasDefTitle != '' && !$bUpdatedDefTitle) {
-                            $res['APP_TITLE'] = G::replaceDataField($tasDefTitle, $aAppData);
-                            $bUpdatedDefTitle = true;
-                        }
-                        break;
-                    case 'TAS_DEF_DESCRIPTION':
-                        $tasDefDescription = $row['CON_VALUE'];
-                        $tasDefDescription = $row['CON_VALUE'];
-                        if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
-                            $res['APP_DESCRIPTION'] = G::replaceDataField($tasDefDescription, $aAppData);
-                            $bUpdatedDefDescription = true;
-                        }
-                        break;
-                }
-                $rs->next();
+            while ($rs->next()) {
                 $row = $rs->getRow();
+                $tasDefTitle = $row['TAS_DEF_TITLE'];
+                if ($tasDefTitle != '' && !$bUpdatedDefTitle) {
+                    $res['APP_TITLE'] = G::replaceDataField($tasDefTitle, $aAppData);
+                    $bUpdatedDefTitle = true;
+                }
+                $tasDefDescription = $row['TAS_DEF_DESCRIPTION'];
+                if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
+                    $res['APP_DESCRIPTION'] = G::replaceDataField($tasDefDescription, $aAppData);
+                    $bUpdatedDefDescription = true;
+                }
             }
         }
         return $res;
@@ -789,71 +747,51 @@ class Cases
         while (is_array($rowCri)) {
             $c = new Criteria();
             $c->clearSelectColumns();
-            $c->addSelectColumn(ContentPeer::CON_CATEGORY);
-            $c->addSelectColumn(ContentPeer::CON_VALUE);
-            $c->add(ContentPeer::CON_ID, $rowCri['TAS_UID']);
-            $c->add(ContentPeer::CON_LANG, $lang);
-            $c->add(ContentPeer::CON_CATEGORY, array("TAS_DEF_TITLE", "TAS_DEF_DESCRIPTION"), Criteria::IN);
+            $c->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
+            $c->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
+            $c->add(TaskPeer::TAS_UID, $rowCri['TAS_UID']);
             $rs = TaskPeer::doSelectRS($c);
             $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
             while ($rs->next()) {
                 $row = $rs->getRow();
+                $tasDefTitle = trim($row['TAS_DEF_TITLE']);
+                if ($tasDefTitle != '' && !$bUpdatedDefTitle) {
+                    $newAppTitle = G::replaceDataField($tasDefTitle, $aAppData);
+                    $res['APP_TITLE'] = $newAppTitle;
+                    if (!(isset($fields['APP_TITLE']) && $fields['APP_TITLE'] == $newAppTitle)) {
+                        $bUpdatedDefTitle = true;
+                        /// updating the value in content for row (APP_TITLE,$lan)
+                        $con = Propel::getConnection('workflow');
+                        $c1 = new Criteria('workflow');
+                        $c1->add(ContentPeer::CON_CATEGORY, 'APP_TITLE');
+                        $c1->add(ContentPeer::CON_ID, $sAppUid);
+                        $c1->add(ContentPeer::CON_LANG, $lang);
 
-                switch ($row['CON_CATEGORY']) {
-                    case 'TAS_DEF_TITLE':
-                        if ($bUpdatedDefTitle) {
-                            break;
-                        }
-                        $tasDefTitle = trim($row['CON_VALUE']);
-                        if ($tasDefTitle != '') {
-                            $newAppTitle = G::replaceDataField($tasDefTitle, $aAppData);
-                            $res['APP_TITLE'] = $newAppTitle;
-                            if (isset($fields['APP_TITLE']) && $fields['APP_TITLE'] == $newAppTitle) {
-                                break;
-                            }
-                            $bUpdatedDefTitle = true;
-                            /// updating the value in content for row (APP_TITLE,$lan)
-                            $con = Propel::getConnection('workflow');
-                            $c1 = new Criteria('workflow');
-                            $c1->add(ContentPeer::CON_CATEGORY, 'APP_TITLE');
-                            $c1->add(ContentPeer::CON_ID, $sAppUid);
-                            $c1->add(ContentPeer::CON_LANG, $lang);
-
-                            // update set
-                            $c2 = new Criteria('workflow');
-                            $c2->add(ContentPeer::CON_VALUE, $newAppTitle);
-                            BasePeer::doUpdate($c1, $c2, $con);
-                        }
-                        break;
-                    case 'TAS_DEF_DESCRIPTION':
-                        if ($bUpdatedDefDescription) {
-                            break;
-                        }
-                        $tasDefDescription = trim($row['CON_VALUE']);
-                        if ($tasDefDescription != '') {
-                            $newAppDescription = G::replaceDataField($tasDefDescription, $aAppData);
-                            $res['APP_DESCRIPTION'] = $newAppDescription;
-                            if (isset($fields['APP_DESCRIPTION']) &&
-                                    $fields['APP_DESCRIPTION'] == $newAppDescription) {
-                                break;
-                            }
-                            $bUpdatedDefDescription = true;
-                            /// updating the value in content for row (APP_TITLE,$lan)
-                            $con = Propel::getConnection('workflow');
-                            $c1 = new Criteria('workflow');
-                            $c1->add(ContentPeer::CON_CATEGORY, 'APP_DESCRIPTION');
-                            $c1->add(ContentPeer::CON_ID, $sAppUid);
-                            $c1->add(ContentPeer::CON_LANG, $lang);
-                            // update set
-                            $c2 = new Criteria('workflow');
-                            $c2->add(ContentPeer::CON_VALUE, $newAppDescription);
-                            BasePeer::doUpdate($c1, $c2, $con);
-                        }
-                        break;
+                        // update set
+                        $c2 = new Criteria('workflow');
+                        $c2->add(ContentPeer::CON_VALUE, $newAppTitle);
+                        BasePeer::doUpdate($c1, $c2, $con);
+                    }
+                }
+                $tasDefDescription = trim($row['TAS_DEF_DESCRIPTION']);
+                if ($tasDefDescription != '' && !$bUpdatedDefDescription) {
+                    $newAppDescription = G::replaceDataField($tasDefDescription, $aAppData);
+                    $res['APP_DESCRIPTION'] = $newAppDescription;
+                    if (!(isset($fields['APP_DESCRIPTION']) && $fields['APP_DESCRIPTION'] == $newAppDescription)) {
+                        $bUpdatedDefDescription = true;
+                        /// updating the value in content for row (APP_TITLE,$lan)
+                        $con = Propel::getConnection('workflow');
+                        $c1 = new Criteria('workflow');
+                        $c1->add(ContentPeer::CON_CATEGORY, 'APP_DESCRIPTION');
+                        $c1->add(ContentPeer::CON_ID, $sAppUid);
+                        $c1->add(ContentPeer::CON_LANG, $lang);
+                        // update set
+                        $c2 = new Criteria('workflow');
+                        $c2->add(ContentPeer::CON_VALUE, $newAppDescription);
+                        BasePeer::doUpdate($c1, $c2, $con);
+                    }
                 }
             }
-
             $rsCri->next();
             $rowCri = $rsCri->getRow();
         }
@@ -2736,7 +2674,7 @@ class Cases
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
         $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
         $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
-        $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
+        $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME,
@@ -2746,7 +2684,6 @@ class Cases
 
         $c->addAlias("APP_TITLE", 'CONTENT');
         $c->addAlias("PRO_TITLE", 'CONTENT');
-        $c->addAlias("TAS_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
@@ -2770,12 +2707,6 @@ class Cases
         $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
         $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
 
-        $tasTitleConds = array();
-        $tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-        $tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-        $tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
-
         $prevConds = array();
         $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
         $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
@@ -2980,11 +2911,10 @@ class Cases
                 $c->addSelectColumn(ApplicationPeer::APP_STATUS);
                 $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
                 $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
-                $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
+                $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
 
                 $c->addAlias("APP_TITLE", 'CONTENT');
                 $c->addAlias("PRO_TITLE", 'CONTENT');
-                $c->addAlias("TAS_TITLE", 'CONTENT');
 
                 $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
                 $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
@@ -3005,12 +2935,6 @@ class Cases
                 $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
                 $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
                 $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
-                //
-                $tasTitleConds = array();
-                $tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-                $tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-                $tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-                $c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
 
                 $c->add(AppDelegationPeer::USR_UID, '');
                 $c->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
@@ -3147,7 +3071,7 @@ class Cases
         if ($titles) {
             $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
             $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
-            $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
+            $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         }
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
@@ -3156,7 +3080,6 @@ class Cases
         if ($titles) {
             $c->addAlias("APP_TITLE", 'CONTENT');
             $c->addAlias("PRO_TITLE", 'CONTENT');
-            $c->addAlias("TAS_TITLE", 'CONTENT');
         }
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
@@ -3181,12 +3104,6 @@ class Cases
             $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
             $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
             $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
-
-            $tasTitleConds = array();
-            $tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-            $tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-            $tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-            $c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
         }
 
         $prevConds = array();
@@ -3246,14 +3163,13 @@ class Cases
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
         $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
         $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
-        $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
+        $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
 
         $c->addAlias("APP_TITLE", 'CONTENT');
         $c->addAlias("PRO_TITLE", 'CONTENT');
-        $c->addAlias("TAS_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
@@ -3277,12 +3193,6 @@ class Cases
         $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
         $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
 
-        $tasTitleConds = array();
-        $tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-        $tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-        $tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
-
         $prevConds = array();
         $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
         $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
@@ -6824,7 +6734,7 @@ class Cases
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
         $c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
         $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
-        $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
+        $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"
@@ -6832,7 +6742,6 @@ class Cases
 
         $c->addAlias("APP_TITLE", 'CONTENT');
         $c->addAlias("PRO_TITLE", 'CONTENT');
-        $c->addAlias("TAS_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
@@ -6856,12 +6765,6 @@ class Cases
         $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
         $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
 
-        $tasTitleConds = array();
-        $tasTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-        $tasTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-        $tasTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
-
         $prevConds = array();
         $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
         $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 5c99a2a18..c3f555bc6 100755
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -2984,7 +2984,7 @@ function PMFSaveCurrentData ()
  * @name PMFTasksListByProcessId
  * @label PMF Tasks List By Process Id
  * @param string | $processId | ID Process | To get the current process id, use the system variable @@PROCESS
- * @param string | $lang | Language | Is the language of the text, that must be the same to the column: "CON_LANG" of the CONTENT table
+ * @param string | $lang | Language | This parameter actually is not used, the same is kept by backward compatibility.Is the language of the text, that must be the same to the column: "CON_LANG" of the CONTENT table
  * @return array | $result | Array result | Array of associative arrays which contain the unique task ID and title
  */
 function PMFTasksListByProcessId($processId, $lang = 'en')
@@ -2992,11 +2992,7 @@ function PMFTasksListByProcessId($processId, $lang = 'en')
     $result = array();
     $criteria = new Criteria("workflow");
     $criteria->addSelectColumn(TaskPeer::TAS_UID);
-    $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-    $criteria->addSelectColumn(ContentPeer::CON_LANG);
-    $criteria->addJoin(TaskPeer::TAS_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN);
-    $criteria->add(ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL);
-    $criteria->add(ContentPeer::CON_LANG, $lang, Criteria::EQUAL);
+    $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
     $criteria->add(TaskPeer::PRO_UID, $processId, Criteria::EQUAL);
     $ds = TaskPeer::doSelectRS($criteria);
     $ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -3170,14 +3166,18 @@ function PMFDynaFormFields($dynUid, $appUid = false, $delIndex = 0)
  * @name PMFGetTaskName
  * @label PMF Get Task Title Text
  * @param string | $taskUid | ID Task | Is the identifier of task, that must be the same to the column: "TAS_UID" of the TASK table
- * @param string | $lang | Language | Is the language of the text, that must be the same to the column: "CON_LANG" of the CONTENT table
+ * @param string | $lang | Language | This parameter actually is not used, the same is kept by backward compatibility. Is the language of the text, that must be the same to the column: "CON_LANG" 
+ * of the CONTENT table
  * @return string | $text | Translated text | the translated text of a string in Content
  */
 function PMFGetTaskName($taskUid, $lang = SYS_LANG) {
     if (empty($taskUid)) {
         return false;
     }
-    return PMFGeti18nText($taskUid, 'TAS_TITLE', $lang);
+    $oTask = new \Task();
+    $aTasks = $oTask->load($taskUid);
+    $text = isset($aTasks["TAS_TITLE"]) ? $aTasks["TAS_TITLE"] : false;
+    return $text;
 }
 
 /**
diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 6b269e0b4..918f6d8a9 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -98,34 +98,29 @@ class processMap
             $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(TaskPeer::PRO_UID);
             $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
-            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
+            $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
             $oCriteria->addSelectColumn(TaskPeer::TAS_START);
             $oCriteria->addSelectColumn(TaskPeer::TAS_POSX);
             $oCriteria->addSelectColumn(TaskPeer::TAS_POSY);
             $oCriteria->addSelectColumn(TaskPeer::TAS_COLOR);
             $oCriteria->addSelectColumn(TaskPeer::TAS_TYPE);
-            $aConditions = array();
-            $aConditions[] = array(0 => TaskPeer::TAS_UID, 1 => ContentPeer::CON_ID);
-            $aConditions[] = array(0 => ContentPeer::CON_CATEGORY, 1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter() );
-            $aConditions[] = array(0 => ContentPeer::CON_LANG, 1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
             $oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
             $oDataset = TaskPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
 
             while ($aRow1 = $oDataset->getRow()) {
-                $oTask = new StdClass();
+                $oTask = new stdClass();
                 $oTask->uid = $aRow1['TAS_UID'];
                 $oTask->task_type = $aRow1['TAS_TYPE'];
                 if ($aRow1['TAS_TYPE'] == 'NORMAL') {
-                    if (($aRow1['CON_VALUE'] == "")) {
+                    if (($aRow1['TAS_TITLE'] == "")) {
                         //There is no Label in Current SYS_LANG language so try to find in English - by default
                         $oTask1 = new Task();
                         $aFields1 = $oTask1->load($oTask->uid);
-                        $aRow1['CON_VALUE'] = $oTask1->getTasTitle();
+                        $aRow1['TAS_TITLE'] = $oTask1->getTasTitle();
                     }
-                    $oTask->label = htmlentities($aRow1['CON_VALUE'], ENT_QUOTES, 'UTF-8');
+                    $oTask->label = htmlentities($aRow1['TAS_TITLE'], ENT_QUOTES, 'UTF-8');
                 } else {
                     $oCriteria = new Criteria('workflow');
                     $del = DBAdapter::getStringDelimiter();
@@ -153,10 +148,10 @@ class processMap
                     }
                 }
                 $oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false);
-                $oTask->position = new StdClass();
+                $oTask->position = new stdClass();
                 $oTask->position->x = (int) $aRow1['TAS_POSX'];
                 $oTask->position->y = (int) $aRow1['TAS_POSY'];
-                $oTask->derivation = new StdClass();
+                $oTask->derivation = new stdClass();
                 $oTask->derivation->type = '';
                 $oTask->derivation->to = array();
                 $oCriteria = new Criteria('workflow');
@@ -189,7 +184,7 @@ class processMap
                             $aRow2['ROU_TYPE'] = 8;
                             break;
                     }
-                    $oTo = new StdClass();
+                    $oTo = new stdClass();
                     $oTo->task = $aRow2['ROU_NEXT_TASK'];
                     $oTo->condition = $aRow2['ROU_CONDITION'];
                     $oTo->executant = $aRow2['ROU_TO_LAST_USER'];
@@ -1356,7 +1351,7 @@ class processMap
     {
         try {
             $oCriteria = new Criteria('workflow');
-            $oCriteria->addSelectColumn('TAS_UID');
+            $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
             $oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
             $oDataset = TaskPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -1366,50 +1361,29 @@ class processMap
 
             while ($oDataset->next()) {
                 $aRow = $oDataset->getRow();
-
                 $aTasks[] = $aRow["TAS_UID"];
                 $iTaskNumber = $iTaskNumber + 1;
             }
 
             if ($iTaskNumber > 0) {
                 $criteria = new Criteria("workflow");
-
-                $criteria->addSelectColumn(ContentPeer::CON_LANG);
-                $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-                $criteria->add(ContentPeer::CON_ID, $aTasks, Criteria::IN);
-                $criteria->add(ContentPeer::CON_CATEGORY, "TAS_TITLE");
-
-                $rsSQLCON = ContentPeer::doSelectRS($criteria);
+                $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+                $criteria->add(TaskPeer::TAS_UID, $aTasks, Criteria::IN);
+                $rsSQLCON = TaskPeer::doSelectRS($criteria);
                 $rsSQLCON->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-                $numMaxLang = 0;
                 $numMax = 0;
-
                 while ($rsSQLCON->next()) {
                     $row = $rsSQLCON->getRow();
-
-                    $conLang = $row["CON_LANG"];
-                    $conValue = $row["CON_VALUE"];
-
+                    $conValue = $row["TAS_TITLE"];
                     if (preg_match("/^\S+\s(\d+)$/", $conValue, $matches)) {
                         $n = intval($matches[1]);
-
-                        if ($conLang == SYS_LANG) {
-                            if ($n > $numMaxLang) {
-                                $numMaxLang = $n;
-                            }
-                        } else {
-                            if ($n > $numMax) {
-                                $numMax = $n;
-                            }
+                        if ($n > $numMax) {
+                            $numMax = $n;
                         }
                     }
                 }
 
-                if ($numMaxLang > 0) {
-                    $numMax = $numMaxLang;
-                }
-
                 if ($numMax > 0 && $numMax > $iTaskNumber) {
                     $iTaskNumber = $numMax + 1;
                 } else {
@@ -1420,7 +1394,7 @@ class processMap
             }
 
             $oTask = new Task();
-            $oNewTask = new StdClass();
+            $oNewTask = new stdClass();
             $oNewTask->label = G::LoadTranslation('ID_TASK') . ' ' . $iTaskNumber;
             $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_WIDTH' => $iWidth, 'TAS_HEIGHT' => $iHeight ));
             $oNewTask->statusIcons = array();
@@ -4781,25 +4755,22 @@ class processMap
         $c = new Criteria();
         $c->clearSelectColumns();
         $c->addSelectColumn(TaskPeer::TAS_UID);
+        $c->addSelectColumn(TaskPeer::TAS_TITLE);
         $c->addSelectColumn(TaskPeer::PRO_UID);
+        $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->add(TaskPeer::TAS_START, 'TRUE');
         $c->add(TaskPeer::PRO_UID, $aUIDS, Criteria::NOT_IN);
+        $c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         //$c->add(TaskPeer::PRO_UID, $sProcessUID, Criteria::NOT_EQUAL);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $rs->next();
-        $row = $rs->getRow();
-        while (is_array($row)) {
-            $tasks[] = array('TAS_UID' => $row['TAS_UID'], 'PRO_UID' => $row['PRO_UID'] );
-            $rs->next();
-            $row = $rs->getRow();
-        }
         $rows[] = array('uid' => 'char', 'value' => 'char', 'pro_uid' => 'char' );
-        foreach ($tasks as $key => $val) {
-            $tasTitle = Content::load('TAS_TITLE', '', $val['TAS_UID'], SYS_LANG);
-            $proTitle = Content::load('PRO_TITLE', '', $val['PRO_UID'], SYS_LANG);
+        while ($rs->next()) {
+            $row = $rs->getRow();
+            $proTitle = $row['PRO_TITLE'];
+            $tasTitle = $row['TAS_TITLE'];
             $title = " $proTitle ($tasTitle)";
-            $rows[] = array('uid' => $val['TAS_UID'], 'value' => $title, 'pro_uid' => $val['PRO_UID'] );
+            $rows[] = array('uid' => $row['TAS_UID'], 'value' => $title, 'pro_uid' => $row['PRO_UID'] );
         }
         return $rows;
     }
@@ -6613,19 +6584,13 @@ class processMap
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(TaskPeer::PRO_UID);
         $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
-        $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $aConditions = array();
-        $aConditions[] = array(0 => TaskPeer::TAS_UID, 1 => ContentPeer::CON_ID );
-        $aConditions[] = array(0 => ContentPeer::CON_CATEGORY, 1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter() );
-        $aConditions[] = array(0 => ContentPeer::CON_LANG, 1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() );
-        $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+        $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
         $oCriteria->add(TaskPeer::PRO_UID, $sProcessUID);
         $oDataset = TaskPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
-            $aAllTasks[] = array('UID' => $aRow['TAS_UID'], 'LABEL' => $aRow['CON_VALUE']
-            );
+            $aAllTasks[] = array('UID' => $aRow['TAS_UID'], 'LABEL' => $aRow['TAS_TITLE']);
             $oDataset->next();
         }
         $aUsersGroups = array();
diff --git a/workflow/engine/classes/class.report.php b/workflow/engine/classes/class.report.php
index 94236ad79..0800a9825 100755
--- a/workflow/engine/classes/class.report.php
+++ b/workflow/engine/classes/class.report.php
@@ -194,29 +194,17 @@ class Report
         $oCriteria = new Criteria( 'workflow' );
         $del = DBAdapter::getStringDelimiter();
         $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+        $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
         $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
 
         $oCriteria->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN );
-
-        $oCriteria->addAsColumn( 'TAS_TITLE', 'C.CON_VALUE' );
-        $oCriteria->addAlias( "C", 'CONTENT' );
-
-        $proContentConds = array ();
-        $proContentConds[] = array (AppDelegationPeer::TAS_UID,'C.CON_ID'
-        );
-        $proContentConds[] = array ('C.CON_CATEGORY',$del . 'TAS_TITLE' . $del
-        );
-        $proContentConds[] = array ('C.CON_LANG',$del . SYS_LANG . $del
-        );
-        $oCriteria->addJoinMC( $proContentConds, Criteria::LEFT_JOIN );
-
         $oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID );
 
         $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
-        $oCriteria->addGroupByColumn( 'C.CON_VALUE' );
+        $oCriteria->addGroupByColumn( TaskPeer::TAS_TITLE );
 
         $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
@@ -359,25 +347,13 @@ class Report
         $oCriteria = new Criteria( 'workflow' );
         $del = DBAdapter::getStringDelimiter();
         $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+        $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
         $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
 
         $oCriteria->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN );
-
-        $oCriteria->addAsColumn( 'TAS_TITLE', 'C.CON_VALUE' );
-        $oCriteria->addAlias( "C", 'CONTENT' );
-
-        $proContentConds = array ();
-        $proContentConds[] = array (AppDelegationPeer::TAS_UID,'C.CON_ID'
-        );
-        $proContentConds[] = array ('C.CON_CATEGORY',$del . 'TAS_TITLE' . $del
-        );
-        $proContentConds[] = array ('C.CON_LANG',$del . SYS_LANG . $del
-        );
-        $oCriteria->addJoinMC( $proContentConds, Criteria::LEFT_JOIN );
-
         $oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );
 
         if ($startedby != '') {
@@ -387,7 +363,7 @@ class Report
         $oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID );
 
         $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
-        $oCriteria->addGroupByColumn( 'C.CON_VALUE' );
+        $oCriteria->addGroupByColumn( TaskPeer::TAS_TITLE );
 
         return $oCriteria;
     }
diff --git a/workflow/engine/classes/class.tasks.php b/workflow/engine/classes/class.tasks.php
index ae48ba0e1..48ff85128 100755
--- a/workflow/engine/classes/class.tasks.php
+++ b/workflow/engine/classes/class.tasks.php
@@ -87,21 +87,16 @@ class Tasks
     {
         try {
             $aTasks = array();
-            $sDelimiter = @DBAdapter::getStringDelimiter();
             $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
             $oCriteria->add(TaskPeer::PRO_UID, $sProUid);
-            $aConditions = array();
-            $aConditions[] = array(TaskPeer::TAS_UID, ContentPeer::CON_ID);
-            $aConditions[] = array(ContentPeer::CON_CATEGORY, $sDelimiter . 'TAS_TITLE' . $sDelimiter);
-            $aConditions[] = array(ContentPeer::CON_LANG, $sDelimiter . SYS_LANG . $sDelimiter);
-            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-            $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
+            $oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
             $oDataset = TaskPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
                 $oTask = new Task();
-                $aTasks[] = $oTask->Load($aRow['TAS_UID']);
+                $aTasks[] = $oTask->load($aRow['TAS_UID']);
                 $oDataset->next();
             }
             return $aTasks;
@@ -703,6 +698,7 @@ class Tasks
         try {
             $aTasks = array();
             $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
             $oCriteria->add(TaskPeer::PRO_UID, $sProUid);
             //$oCriteria->add(TaskPeer::TAS_USER,    $sUsrUid);
             $oCriteria->add(TaskPeer::TAS_START, 'TRUE');
@@ -711,7 +707,7 @@ class Tasks
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
                 $oTask = new Task();
-                $aTasks[] = $oTask->Load($aRow['TAS_UID']);
+                $aTasks[] = $oTask->load($aRow['TAS_UID']);
                 $oDataset->next();
             }
             return $aTasks;
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index b3365ee50..c423a5c14 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -846,7 +846,7 @@ class wsBase
     public function taskList ($userId)
     {
         try {
-            g::loadClass( 'groups' );
+            G::LoadClass( 'groups' );
             $oGroup = new Groups();
             $aGroups = $oGroup->getActiveGroupsForAnUser( $userId );
 
@@ -855,19 +855,9 @@ class wsBase
             $del = DBAdapter::getStringDelimiter();
             $oCriteria->addSelectColumn( TaskPeer::PRO_UID );
             $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
+            $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
             $oCriteria->addSelectColumn( TaskPeer::TAS_START );
             $oCriteria->setDistinct();
-            $oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
-            $oCriteria->addAlias( "C1", 'CONTENT' );
-            $tasTitleConds = array ();
-            $tasTitleConds[] = array (TaskPeer::TAS_UID,'C1.CON_ID'
-            );
-            $tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del
-            );
-            $tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
-            );
-            $oCriteria->addJoinMC( $tasTitleConds, Criteria::LEFT_JOIN );
-
             $oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN );
             $oCriteria->addOr( TaskUserPeer::USR_UID, $userId );
             $oCriteria->addOr( TaskUserPeer::USR_UID, $aGroups, Criteria::IN );
@@ -1960,7 +1950,7 @@ class wsBase
             $pro = $oProcesses->processExists( $processId );
 
             if (! $pro) {
-                $result = new wsResponse( 11, G::loadTranslation( 'ID_INVALID_PROCESS' ) . " " . $processId );
+                $result = new wsResponse( 11, G::LoadTranslation( 'ID_INVALID_PROCESS' ) . " " . $processId );
 
                 $g->sessionVarRestore();
 
@@ -1992,7 +1982,7 @@ class wsBase
                 }
 
                 if ($tasksInThisProcess > 1) {
-                    $result = new wsResponse( 13, G::loadTranslation( 'ID_MULTIPLE_STARTING_TASKS' ) );
+                    $result = new wsResponse( 13, G::LoadTranslation( 'ID_MULTIPLE_STARTING_TASKS' ) );
 
                     $g->sessionVarRestore();
 
@@ -2005,7 +1995,7 @@ class wsBase
             $arrayTaskTypeToExclude = array("START-TIMER-EVENT");
 
             if (!is_null($task) && !in_array($task->getTasType(), $arrayTaskTypeToExclude) && $founded == "") {
-                $result = new wsResponse( 14, G::loadTranslation( 'ID_TASK_INVALID_USER_NOT_ASSIGNED_TASK' ) );
+                $result = new wsResponse( 14, G::LoadTranslation( 'ID_TASK_INVALID_USER_NOT_ASSIGNED_TASK' ) );
 
                 $g->sessionVarRestore();
 
@@ -2054,7 +2044,7 @@ class wsBase
             }
 
             //Response
-            $result = new wsResponse( 0, G::loadTranslation( 'ID_STARTED_SUCCESSFULLY' ) );
+            $result = new wsResponse( 0, G::LoadTranslation( 'ID_STARTED_SUCCESSFULLY' ) );
             $result->caseId = $caseId;
             $result->caseNumber = $caseNr;
 
@@ -2201,7 +2191,7 @@ class wsBase
                 $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
 
                 if (AppDelegationPeer::doCount( $oCriteria ) > 1) {
-                    $result = new wsResponse( 20, G::loadTranslation( 'ID_SPECIFY_DELEGATION_INDEX' ) );
+                    $result = new wsResponse( 20, G::LoadTranslation( 'ID_SPECIFY_DELEGATION_INDEX' ) );
                     return $result;
                 }
 
@@ -2216,13 +2206,13 @@ class wsBase
             $appdel = $oAppDel->Load( $caseId, $delIndex );
 
             if ($userId != $appdel['USR_UID']) {
-                $result = new wsResponse( 17, G::loadTranslation( 'ID_CASE_ASSIGNED_ANOTHER_USER' ) );
+                $result = new wsResponse( 17, G::LoadTranslation( 'ID_CASE_ASSIGNED_ANOTHER_USER' ) );
 
                 return $result;
             }
 
             if ($appdel['DEL_FINISH_DATE'] != null) {
-                $result = new wsResponse( 18, G::loadTranslation( 'ID_CASE_DELEGATION_ALREADY_CLOSED' ) );
+                $result = new wsResponse( 18, G::LoadTranslation( 'ID_CASE_DELEGATION_ALREADY_CLOSED' ) );
 
                 return $result;
             }
@@ -2240,7 +2230,7 @@ class wsBase
 
             if (is_array( $aRow )) {
                 if (isset( $aRow['APP_DISABLE_ACTION_USER'] ) && $aRow['APP_DISABLE_ACTION_USER'] != 0 && isset( $aRow['APP_DISABLE_ACTION_DATE'] ) && $aRow['APP_DISABLE_ACTION_DATE'] != '') {
-                    $result = new wsResponse( 19, G::loadTranslation( 'ID_CASE_IN_STATUS' ) . " " . $aRow['APP_TYPE'] );
+                    $result = new wsResponse( 19, G::LoadTranslation( 'ID_CASE_IN_STATUS' ) . " " . $aRow['APP_TYPE'] );
 
                     return $result;
                 }
@@ -2378,19 +2368,19 @@ class wsBase
 
                 if (isset($derive[1])) {
                     if ($derive[1]['ROU_TYPE'] == 'SELECT') {
-                        $result = new wsResponse(21, G::loadTranslation('ID_CAN_NOT_ROUTE_CASE_USING_WEBSERVICES'));
+                        $result = new wsResponse(21, G::LoadTranslation('ID_CAN_NOT_ROUTE_CASE_USING_WEBSERVICES'));
 
                         return $result;
                     }
                 } else {
-                    $result = new wsResponse(22, G::loadTranslation('ID_TASK_DOES_NOT_HAVE_ROUTING_RULE'));
+                    $result = new wsResponse(22, G::LoadTranslation('ID_TASK_DOES_NOT_HAVE_ROUTING_RULE'));
 
                     return $result;
                 }
 
                 foreach ($derive as $key => $val) {
                     if ($val['NEXT_TASK']['TAS_ASSIGN_TYPE'] == 'MANUAL') {
-                        $result = new wsResponse(15, G::loadTranslation('ID_TASK_DEFINED_MANUAL_ASSIGNMENT'));
+                        $result = new wsResponse(15, G::LoadTranslation('ID_TASK_DEFINED_MANUAL_ASSIGNMENT'));
 
                         return $result;
                     }
@@ -2536,7 +2526,7 @@ class wsBase
                         $appFields, $nextDelegations, $nextIndex, $delIndex);
                 }
             } catch (Exception $e) {
-                \G::log(G::loadTranslation( 'ID_NOTIFICATION_ERROR' ) . '|' . $e->getMessage() , PATH_DATA, "mobile.log");
+                \G::log(G::LoadTranslation( 'ID_NOTIFICATION_ERROR' ) . '|' . $e->getMessage() , PATH_DATA, "mobile.log");
             }
             // Send notifications Mobile - End
 
diff --git a/workflow/engine/classes/model/Task.php b/workflow/engine/classes/model/Task.php
index 7654164b6..51987690a 100755
--- a/workflow/engine/classes/model/Task.php
+++ b/workflow/engine/classes/model/Task.php
@@ -20,22 +20,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_title = '';
+    protected $tas_title_content = '';
 
     /**
      * Get the tas_title column value.
      * @return     string
      */
-    public function getTasTitle()
+    public function getTasTitleContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in getTasTitle, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_title = Content::load('TAS_TITLE', '', $this->getTasUid(), $lang);
+        $this->tas_title_content = Content::load('TAS_TITLE', '', $this->getTasUid(), $lang);
 
-        return $this->tas_title;
+        return $this->tas_title_content;
     }
 
     /**
@@ -44,7 +44,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasTitle($v)
+    public function setTasTitleContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in setTasTitle, the getTasUid() can't be blank"));
@@ -53,10 +53,10 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_title !== $v || $v === "") {
-            $this->tas_title = $v;
+        if ($this->tas_title_content !== $v || $v === "") {
+            $this->tas_title_content = $v;
 
-            $res = Content::addContent('TAS_TITLE', '', $this->getTasUid(), $lang, $this->tas_title);
+            $res = Content::addContent('TAS_TITLE', '', $this->getTasUid(), $lang, $this->tas_title_content);
 
             return $res;
         }
@@ -68,22 +68,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_description = '';
+    protected $tas_description_content = '';
 
     /**
      * Get the tas_description column value.
      * @return     string
      */
-    public function getTasDescription()
+    public function getTasDescriptionContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception( "Error in getTasDescription, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_description = Content::load('TAS_DESCRIPTION', '', $this->getTasUid(), $lang);
+        $this->tas_description_content = Content::load('TAS_DESCRIPTION', '', $this->getTasUid(), $lang);
 
-        return $this->tas_description;
+        return $this->tas_description_content;
     }
 
     /**
@@ -92,7 +92,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasDescription($v)
+    public function setTasDescriptionContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in setTasDescription, the getTasUid() can't be blank"));
@@ -101,10 +101,10 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_description !== $v || $v === "") {
-            $this->tas_description = $v;
+        if ($this->tas_description_content !== $v || $v === "") {
+            $this->tas_description_content = $v;
 
-            $res = Content::addContent('TAS_DESCRIPTION', '', $this->getTasUid(), $lang, $this->tas_description);
+            $res = Content::addContent('TAS_DESCRIPTION', '', $this->getTasUid(), $lang, $this->tas_description_content);
 
             return $res;
         }
@@ -116,22 +116,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_def_title = '';
+    protected $tas_def_title_content = '';
 
     /**
      * Get the tas_def_title column value.
      * @return     string
      */
-    public function getTasDefTitle()
+    public function getTasDefTitleContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception( "Error in getTasDefTitle, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_def_title = Content::load('TAS_DEF_TITLE', '', $this->getTasUid(), $lang);
+        $this->tas_def_title_content = Content::load('TAS_DEF_TITLE', '', $this->getTasUid(), $lang);
 
-        return $this->tas_def_title;
+        return $this->tas_def_title_content;
     }
 
     /**
@@ -140,7 +140,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasDefTitle($v)
+    public function setTasDefTitleContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in setTasDefTitle, the getTasUid() can't be blank"));
@@ -149,10 +149,10 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_def_title !== $v || $v === "") {
-            $this->tas_def_title = $v;
+        if ($this->tas_def_title_content !== $v || $v === "") {
+            $this->tas_def_title_content = $v;
 
-            $res = Content::addContent('TAS_DEF_TITLE', '', $this->getTasUid(), $lang, $this->tas_def_title);
+            $res = Content::addContent('TAS_DEF_TITLE', '', $this->getTasUid(), $lang, $this->tas_def_title_content);
 
             return $res;
         }
@@ -164,22 +164,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_def_description = '';
+    protected $tas_def_description_content = '';
 
     /**
      * Get the tas_def_description column value.
      * @return     string
      */
-    public function getTasDefDescription()
+    public function getTasDefDescriptionContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception( "Error in getTasDefDescription, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_def_description = Content::load('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang);
+        $this->tas_def_description_content = Content::load('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang);
 
-        return $this->tas_def_description;
+        return $this->tas_def_description_content;
     }
 
     /**
@@ -188,7 +188,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasDefDescription($v)
+    public function setTasDefDescriptionContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in setTasDefDescription, the getTasUid() can't be blank"));
@@ -197,8 +197,8 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_def_description !== $v || $v === "") {
-            $this->tas_def_description = $v;
+        if ($this->tas_def_description_content !== $v || $v === "") {
+            $this->tas_def_description_content = $v;
 
             $res = Content::addContent('TAS_DEF_DESCRIPTION', '', $this->getTasUid(), $lang, $v);
             return $res;
@@ -211,22 +211,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_def_proc_code = '';
+    protected $tas_def_proc_code_content = '';
 
     /**
      * Get the tas_def_proc_code column value.
      * @return     string
      */
-    public function getTasDefProcCode()
+    public function getTasDefProcCodeContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception( "Error in getTasDefProcCode, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_def_proc_code = Content::load('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang);
+        $this->tas_def_proc_code_content = Content::load('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang);
 
-        return $this->tas_def_proc_code;
+        return $this->tas_def_proc_code_content;
     }
 
     /**
@@ -235,7 +235,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasDefProcCode($v)
+    public function setTasDefProcCodeContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in setTasDefProcCode, the getTasUid() can't be blank"));
@@ -244,10 +244,10 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_def_proc_code !== $v || $v === "") {
-            $this->tas_def_proc_code = $v;
+        if ($this->tas_def_proc_code_content !== $v || $v === "") {
+            $this->tas_def_proc_code_content = $v;
 
-            $res = Content::addContent('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang, $this->tas_def_proc_code);
+            $res = Content::addContent('TAS_DEF_PROC_CODE', '', $this->getTasUid(), $lang, $this->tas_def_proc_code_content);
 
             return $res;
         }
@@ -259,22 +259,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_def_message = '';
+    protected $tas_def_message_content = '';
 
     /**
      * Get the tas_def_message column value.
      * @return     string
      */
-    public function getTasDefMessage()
+    public function getTasDefMessageContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception( "Error in getTasDefMessage, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_def_message = Content::load('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang);
+        $this->tas_def_message_content = Content::load('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang);
 
-        return $this->tas_def_message;
+        return $this->tas_def_message_content;
     }
 
     /**
@@ -283,7 +283,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasDefMessage($v)
+    public function setTasDefMessageContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in setTasDefMessage, the getTasUid() can't be blank"));
@@ -291,10 +291,10 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_def_message !== $v || $v === "") {
-            $this->tas_def_message = $v;
+        if ($this->tas_def_message_content !== $v || $v === "") {
+            $this->tas_def_message_content = $v;
 
-            $res = Content::addContent('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang, $this->tas_def_message);
+            $res = Content::addContent('TAS_DEF_MESSAGE', '', $this->getTasUid(), $lang, $this->tas_def_message_content);
 
             return $res;
         }
@@ -306,22 +306,22 @@ class Task extends BaseTask
      * This value goes in the content table
      * @var        string
      */
-    protected $tas_def_subject_message = '';
+    protected $tas_def_subject_message_content = '';
 
     /**
      * Get the tas_def_message column value.
      * @return     string
      */
-    public function getTasDefSubjectMessage()
+    public function getTasDefSubjectMessageContent()
     {
         if ($this->getTasUid() == "") {
             throw (new Exception("Error in getTasDefSubjectMessage, the getTasUid() can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
-        $this->tas_def_subject_message = Content::load('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang);
+        $this->tas_def_subject_message_content = Content::load('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang);
 
-        return $this->tas_def_subject_message;
+        return $this->tas_def_subject_message_content;
     }
 
     /**
@@ -330,7 +330,7 @@ class Task extends BaseTask
      * @param      string $v new value
      * @return     void
      */
-    public function setTasDefSubjectMessage($v)
+    public function setTasDefSubjectMessageContent($v)
     {
         if ($this->getTasUid() == "") {
             throw (new Exception( "Error in setTasDefSubjectMessage, the getTasUid() can't be blank"));
@@ -339,8 +339,8 @@ class Task extends BaseTask
         $v = isset($v)? ((string)$v) : '';
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
 
-        if ($this->tas_def_subject_message !== $v || $v === "") {
-            $this->tas_def_subject_message = $v;
+        if ($this->tas_def_subject_message_content !== $v || $v === "") {
+            $this->tas_def_subject_message_content = $v;
 
             $res = Content::addContent('TAS_DEF_SUBJECT_MESSAGE', '', $this->getTasUid(), $lang, $v);
 
@@ -370,6 +370,13 @@ class Task extends BaseTask
             $con->begin();
             $this->setProUid($aData['PRO_UID']);
             $this->setTasUid($sTaskUID);
+            $this->setTasTitle((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: ''));
+            $this->setTasDescription((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: ''));
+            $this->setTasDefTitle("");
+            $this->setTasDefDescription("");
+            $this->setTasDefProcCode("");
+            $this->setTasDefMessage("");
+            $this->setTasDefSubjectMessage("");
             $this->setTasType("NORMAL");
             $this->setTasDuration("1");
             $this->setTasDelayType("");
@@ -405,16 +412,15 @@ class Task extends BaseTask
             $this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
 
             if ($this->validate()) {
-                $this->setTasTitle((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: ''));
-                $this->setTasDescription((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: ''));
-                $this->setTasDefTitle("");
-                $this->setTasDefDescription("");
-                $this->setTasDefProcCode("");
-                $this->setTasDefMessage("");
-                $this->setTasDefSubjectMessage("");
+                $this->setTasTitleContent((isset($aData['TAS_TITLE']) ? $aData['TAS_TITLE']: ''));
+                $this->setTasDescriptionContent((isset($aData['TAS_DESCRIPTION']) ? $aData['TAS_DESCRIPTION']: ''));
+                $this->setTasDefTitleContent("");
+                $this->setTasDefDescriptionContent("");
+                $this->setTasDefProcCodeContent("");
+                $this->setTasDefMessageContent("");
+                $this->setTasDefSubjectMessageContent("");
                 $this->save();
                 $con->commit();
-
                 return $sTaskUID;
             } else {
                 $con->rollback();
@@ -458,19 +464,6 @@ class Task extends BaseTask
                                                                       //Populating attributes
                 $this->setNew(false);
 
-                ///////
-                //Create new records for TASK in CONTENT for the current language, this if is necesary
-                //Populating others attributes
-                $this->setTasUid($TasUid);
-
-                $aFields["TAS_TITLE"] = $this->getTasTitle();
-                $aFields["TAS_DESCRIPTION"] = $this->getTasDescription();
-                $aFields["TAS_DEF_TITLE"] = $this->getTasDefTitle();
-                $aFields["TAS_DEF_DESCRIPTION"] = $this->getTasDefDescription();
-                $aFields["TAS_DEF_PROC_CODE"] = $this->getTasDefProcCode();
-                $aFields["TAS_DEF_MESSAGE"] = $this->getTasDefMessage();
-                $aFields["TAS_DEF_SUBJECT_MESSAGE"] = $this->getTasDefSubjectMessage();
-
                 /*----------------------------------********---------------------------------*/
                 G::LoadClass("indicatorsCalculator");
                 $indicator = new indicatorsCalculator();
@@ -503,52 +496,36 @@ class Task extends BaseTask
             $this->validateAssignType($fields,$oldValues);
             
             if ($this->validate()) {
-                $taskDefTitlePrevious = null;
-
-                $criteria = new Criteria("workflow");
-
-                $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-                $criteria->add(ContentPeer::CON_CATEGORY, "TAS_DEF_TITLE");
-                $criteria->add(ContentPeer::CON_ID, $fields["TAS_UID"]);
-                $criteria->add(ContentPeer::CON_LANG, SYS_LANG);
-
-                $rsCriteria = ContentPeer::doSelectRS($criteria);
-                $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
-                while ($rsCriteria->next()) {
-                    $row = $rsCriteria->getRow();
-
-                    $taskDefTitlePrevious = $row["CON_VALUE"];
-                }
+                $taskDefTitlePrevious = $oldValues["TAS_DEF_TITLE"];
 
                 $contentResult = 0;
 
                 if (array_key_exists("TAS_TITLE", $fields)) {
-                    $contentResult += $this->setTasTitle($fields["TAS_TITLE"]);
+                    $contentResult += $this->setTasTitleContent($fields["TAS_TITLE"]);
                 }
 
                 if (array_key_exists("TAS_DESCRIPTION", $fields)) {
-                    $contentResult += $this->setTasDescription($fields["TAS_DESCRIPTION"]);
+                    $contentResult += $this->setTasDescriptionContent($fields["TAS_DESCRIPTION"]);
                 }
 
                 if (array_key_exists("TAS_DEF_TITLE", $fields)) {
-                    $contentResult += $this->setTasDefTitle($fields["TAS_DEF_TITLE"]);
+                    $contentResult += $this->setTasDefTitleContent($fields["TAS_DEF_TITLE"]);
                 }
 
                 if (array_key_exists("TAS_DEF_DESCRIPTION", $fields)) {
-                    $contentResult += $this->setTasDefDescription($fields["TAS_DEF_DESCRIPTION"]);
+                    $contentResult += $this->setTasDefDescriptionContent($fields["TAS_DEF_DESCRIPTION"]);
                 }
 
                 if (array_key_exists("TAS_DEF_PROC_CODE", $fields)) {
-                    $contentResult += $this->setTasDefProcCode($fields["TAS_DEF_PROC_CODE"]);
+                    $contentResult += $this->setTasDefProcCodeContent($fields["TAS_DEF_PROC_CODE"]);
                 }
 
                 if (array_key_exists("TAS_DEF_MESSAGE", $fields)) {
-                    $contentResult += $this->setTasDefMessage(trim($fields["TAS_DEF_MESSAGE"]));
+                    $contentResult += $this->setTasDefMessageContent(trim($fields["TAS_DEF_MESSAGE"]));
                 }
 
                 if (array_key_exists("TAS_DEF_SUBJECT_MESSAGE", $fields)) {
-                    $contentResult += $this->setTasDefSubjectMessage(trim($fields["TAS_DEF_SUBJECT_MESSAGE"]));
+                    $contentResult += $this->setTasDefSubjectMessageContent(trim($fields["TAS_DEF_SUBJECT_MESSAGE"]));
                 }
 
                 if (array_key_exists("TAS_CALENDAR", $fields)) {
@@ -693,15 +670,15 @@ class Task extends BaseTask
             $this->fromArray($aData,BasePeer::TYPE_FIELDNAME);
 
             if ($this->validate()) {
-                $this->setTasTitle((isset($aData['TAS_TITLE'])? $aData['TAS_TITLE'] : ''));
-                $this->setTasDescription((isset($aData['TAS_DESCRIPTION'])? $aData['TAS_DESCRIPTION'] : ''));
-                $this->setTasDefTitle((isset($aData['TAS_DEF_TITLE'])? $aData['TAS_DEF_TITLE'] : ''));
-                $this->setTasDefDescription((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
-                $this->setTasDefProcCode((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
-                $this->setTasDefMessage((isset($aData['TAS_DEF_MESSAGE'])? $aData['TAS_DEF_MESSAGE'] : ''));
+                $this->setTasTitleContent((isset($aData['TAS_TITLE'])? $aData['TAS_TITLE'] : ''));
+                $this->setTasDescriptionContent((isset($aData['TAS_DESCRIPTION'])? $aData['TAS_DESCRIPTION'] : ''));
+                $this->setTasDefTitleContent((isset($aData['TAS_DEF_TITLE'])? $aData['TAS_DEF_TITLE'] : ''));
+                $this->setTasDefDescriptionContent((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
+                $this->setTasDefProcCodeContent((isset($aData['TAS_DEF_DESCRIPTION'])? $aData['TAS_DEF_DESCRIPTION'] : ''));
+                $this->setTasDefMessageContent((isset($aData['TAS_DEF_MESSAGE'])? $aData['TAS_DEF_MESSAGE'] : ''));
 
                 $strAux = isset($aData['TAS_DEF_SUBJECT_MESSAGE'])? $aData['TAS_DEF_SUBJECT_MESSAGE'] : '';
-                $this->setTasDefSubjectMessage($strAux);
+                $this->setTasDefSubjectMessageContent($strAux);
 
                 $this->save();
                 $con->commit();
diff --git a/workflow/engine/classes/model/map/TaskMapBuilder.php b/workflow/engine/classes/model/map/TaskMapBuilder.php
index 44a3eb00e..457cbfd2f 100755
--- a/workflow/engine/classes/model/map/TaskMapBuilder.php
+++ b/workflow/engine/classes/model/map/TaskMapBuilder.php
@@ -69,6 +69,20 @@ class TaskMapBuilder
 
         $tMap->addPrimaryKey('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
+        $tMap->addColumn('TAS_TITLE', 'TasTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
+        $tMap->addColumn('TAS_DESCRIPTION', 'TasDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('TAS_DEF_TITLE', 'TasDefTitle', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('TAS_DEF_SUBJECT_MESSAGE', 'TasDefSubjectMessage', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('TAS_DEF_PROC_CODE', 'TasDefProcCode', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('TAS_DEF_MESSAGE', 'TasDefMessage', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('TAS_DEF_DESCRIPTION', 'TasDefDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
         $tMap->addColumn('TAS_TYPE', 'TasType', 'string', CreoleTypes::VARCHAR, true, 50);
 
         $tMap->addColumn('TAS_DURATION', 'TasDuration', 'double', CreoleTypes::DOUBLE, true, null);
diff --git a/workflow/engine/classes/model/om/BaseTask.php b/workflow/engine/classes/model/om/BaseTask.php
index c2da1e277..e4466be70 100755
--- a/workflow/engine/classes/model/om/BaseTask.php
+++ b/workflow/engine/classes/model/om/BaseTask.php
@@ -39,6 +39,48 @@ abstract class BaseTask extends BaseObject implements Persistent
      */
     protected $tas_uid = '';
 
+    /**
+     * The value for the tas_title field.
+     * @var        string
+     */
+    protected $tas_title;
+
+    /**
+     * The value for the tas_description field.
+     * @var        string
+     */
+    protected $tas_description;
+
+    /**
+     * The value for the tas_def_title field.
+     * @var        string
+     */
+    protected $tas_def_title;
+
+    /**
+     * The value for the tas_def_subject_message field.
+     * @var        string
+     */
+    protected $tas_def_subject_message;
+
+    /**
+     * The value for the tas_def_proc_code field.
+     * @var        string
+     */
+    protected $tas_def_proc_code;
+
+    /**
+     * The value for the tas_def_message field.
+     * @var        string
+     */
+    protected $tas_def_message;
+
+    /**
+     * The value for the tas_def_description field.
+     * @var        string
+     */
+    protected $tas_def_description;
+
     /**
      * The value for the tas_type field.
      * @var        string
@@ -345,6 +387,83 @@ abstract class BaseTask extends BaseObject implements Persistent
         return $this->tas_uid;
     }
 
+    /**
+     * Get the [tas_title] column value.
+     * 
+     * @return     string
+     */
+    public function getTasTitle()
+    {
+
+        return $this->tas_title;
+    }
+
+    /**
+     * Get the [tas_description] column value.
+     * 
+     * @return     string
+     */
+    public function getTasDescription()
+    {
+
+        return $this->tas_description;
+    }
+
+    /**
+     * Get the [tas_def_title] column value.
+     * 
+     * @return     string
+     */
+    public function getTasDefTitle()
+    {
+
+        return $this->tas_def_title;
+    }
+
+    /**
+     * Get the [tas_def_subject_message] column value.
+     * 
+     * @return     string
+     */
+    public function getTasDefSubjectMessage()
+    {
+
+        return $this->tas_def_subject_message;
+    }
+
+    /**
+     * Get the [tas_def_proc_code] column value.
+     * 
+     * @return     string
+     */
+    public function getTasDefProcCode()
+    {
+
+        return $this->tas_def_proc_code;
+    }
+
+    /**
+     * Get the [tas_def_message] column value.
+     * 
+     * @return     string
+     */
+    public function getTasDefMessage()
+    {
+
+        return $this->tas_def_message;
+    }
+
+    /**
+     * Get the [tas_def_description] column value.
+     * 
+     * @return     string
+     */
+    public function getTasDefDescription()
+    {
+
+        return $this->tas_def_description;
+    }
+
     /**
      * Get the [tas_type] column value.
      * 
@@ -884,6 +1003,160 @@ abstract class BaseTask extends BaseObject implements Persistent
 
     } // setTasUid()
 
+    /**
+     * Set the value of [tas_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_title !== $v) {
+            $this->tas_title = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_TITLE;
+        }
+
+    } // setTasTitle()
+
+    /**
+     * Set the value of [tas_description] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasDescription($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_description !== $v) {
+            $this->tas_description = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_DESCRIPTION;
+        }
+
+    } // setTasDescription()
+
+    /**
+     * Set the value of [tas_def_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasDefTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_def_title !== $v) {
+            $this->tas_def_title = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_DEF_TITLE;
+        }
+
+    } // setTasDefTitle()
+
+    /**
+     * Set the value of [tas_def_subject_message] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasDefSubjectMessage($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_def_subject_message !== $v) {
+            $this->tas_def_subject_message = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_DEF_SUBJECT_MESSAGE;
+        }
+
+    } // setTasDefSubjectMessage()
+
+    /**
+     * Set the value of [tas_def_proc_code] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasDefProcCode($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_def_proc_code !== $v) {
+            $this->tas_def_proc_code = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_DEF_PROC_CODE;
+        }
+
+    } // setTasDefProcCode()
+
+    /**
+     * Set the value of [tas_def_message] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasDefMessage($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_def_message !== $v) {
+            $this->tas_def_message = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_DEF_MESSAGE;
+        }
+
+    } // setTasDefMessage()
+
+    /**
+     * Set the value of [tas_def_description] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setTasDefDescription($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->tas_def_description !== $v) {
+            $this->tas_def_description = $v;
+            $this->modifiedColumns[] = TaskPeer::TAS_DEF_DESCRIPTION;
+        }
+
+    } // setTasDefDescription()
+
     /**
      * Set the value of [tas_type] column.
      * 
@@ -1883,102 +2156,116 @@ abstract class BaseTask extends BaseObject implements Persistent
 
             $this->tas_uid = $rs->getString($startcol + 1);
 
-            $this->tas_type = $rs->getString($startcol + 2);
+            $this->tas_title = $rs->getString($startcol + 2);
 
-            $this->tas_duration = $rs->getFloat($startcol + 3);
+            $this->tas_description = $rs->getString($startcol + 3);
 
-            $this->tas_delay_type = $rs->getString($startcol + 4);
+            $this->tas_def_title = $rs->getString($startcol + 4);
 
-            $this->tas_temporizer = $rs->getFloat($startcol + 5);
+            $this->tas_def_subject_message = $rs->getString($startcol + 5);
 
-            $this->tas_type_day = $rs->getString($startcol + 6);
+            $this->tas_def_proc_code = $rs->getString($startcol + 6);
 
-            $this->tas_timeunit = $rs->getString($startcol + 7);
+            $this->tas_def_message = $rs->getString($startcol + 7);
 
-            $this->tas_alert = $rs->getString($startcol + 8);
+            $this->tas_def_description = $rs->getString($startcol + 8);
 
-            $this->tas_priority_variable = $rs->getString($startcol + 9);
+            $this->tas_type = $rs->getString($startcol + 9);
 
-            $this->tas_assign_type = $rs->getString($startcol + 10);
+            $this->tas_duration = $rs->getFloat($startcol + 10);
 
-            $this->tas_assign_variable = $rs->getString($startcol + 11);
+            $this->tas_delay_type = $rs->getString($startcol + 11);
 
-            $this->tas_group_variable = $rs->getString($startcol + 12);
+            $this->tas_temporizer = $rs->getFloat($startcol + 12);
 
-            $this->tas_mi_instance_variable = $rs->getString($startcol + 13);
+            $this->tas_type_day = $rs->getString($startcol + 13);
 
-            $this->tas_mi_complete_variable = $rs->getString($startcol + 14);
+            $this->tas_timeunit = $rs->getString($startcol + 14);
 
-            $this->tas_assign_location = $rs->getString($startcol + 15);
+            $this->tas_alert = $rs->getString($startcol + 15);
 
-            $this->tas_assign_location_adhoc = $rs->getString($startcol + 16);
+            $this->tas_priority_variable = $rs->getString($startcol + 16);
 
-            $this->tas_transfer_fly = $rs->getString($startcol + 17);
+            $this->tas_assign_type = $rs->getString($startcol + 17);
 
-            $this->tas_last_assigned = $rs->getString($startcol + 18);
+            $this->tas_assign_variable = $rs->getString($startcol + 18);
 
-            $this->tas_user = $rs->getString($startcol + 19);
+            $this->tas_group_variable = $rs->getString($startcol + 19);
 
-            $this->tas_can_upload = $rs->getString($startcol + 20);
+            $this->tas_mi_instance_variable = $rs->getString($startcol + 20);
 
-            $this->tas_view_upload = $rs->getString($startcol + 21);
+            $this->tas_mi_complete_variable = $rs->getString($startcol + 21);
 
-            $this->tas_view_additional_documentation = $rs->getString($startcol + 22);
+            $this->tas_assign_location = $rs->getString($startcol + 22);
 
-            $this->tas_can_cancel = $rs->getString($startcol + 23);
+            $this->tas_assign_location_adhoc = $rs->getString($startcol + 23);
 
-            $this->tas_owner_app = $rs->getString($startcol + 24);
+            $this->tas_transfer_fly = $rs->getString($startcol + 24);
 
-            $this->stg_uid = $rs->getString($startcol + 25);
+            $this->tas_last_assigned = $rs->getString($startcol + 25);
 
-            $this->tas_can_pause = $rs->getString($startcol + 26);
+            $this->tas_user = $rs->getString($startcol + 26);
 
-            $this->tas_can_send_message = $rs->getString($startcol + 27);
+            $this->tas_can_upload = $rs->getString($startcol + 27);
 
-            $this->tas_can_delete_docs = $rs->getString($startcol + 28);
+            $this->tas_view_upload = $rs->getString($startcol + 28);
 
-            $this->tas_self_service = $rs->getString($startcol + 29);
+            $this->tas_view_additional_documentation = $rs->getString($startcol + 29);
 
-            $this->tas_start = $rs->getString($startcol + 30);
+            $this->tas_can_cancel = $rs->getString($startcol + 30);
 
-            $this->tas_to_last_user = $rs->getString($startcol + 31);
+            $this->tas_owner_app = $rs->getString($startcol + 31);
 
-            $this->tas_send_last_email = $rs->getString($startcol + 32);
+            $this->stg_uid = $rs->getString($startcol + 32);
 
-            $this->tas_derivation = $rs->getString($startcol + 33);
+            $this->tas_can_pause = $rs->getString($startcol + 33);
 
-            $this->tas_posx = $rs->getInt($startcol + 34);
+            $this->tas_can_send_message = $rs->getString($startcol + 34);
 
-            $this->tas_posy = $rs->getInt($startcol + 35);
+            $this->tas_can_delete_docs = $rs->getString($startcol + 35);
 
-            $this->tas_width = $rs->getInt($startcol + 36);
+            $this->tas_self_service = $rs->getString($startcol + 36);
 
-            $this->tas_height = $rs->getInt($startcol + 37);
+            $this->tas_start = $rs->getString($startcol + 37);
 
-            $this->tas_color = $rs->getString($startcol + 38);
+            $this->tas_to_last_user = $rs->getString($startcol + 38);
 
-            $this->tas_evn_uid = $rs->getString($startcol + 39);
+            $this->tas_send_last_email = $rs->getString($startcol + 39);
 
-            $this->tas_boundary = $rs->getString($startcol + 40);
+            $this->tas_derivation = $rs->getString($startcol + 40);
 
-            $this->tas_derivation_screen_tpl = $rs->getString($startcol + 41);
+            $this->tas_posx = $rs->getInt($startcol + 41);
 
-            $this->tas_selfservice_timeout = $rs->getInt($startcol + 42);
+            $this->tas_posy = $rs->getInt($startcol + 42);
 
-            $this->tas_selfservice_time = $rs->getString($startcol + 43);
+            $this->tas_width = $rs->getInt($startcol + 43);
 
-            $this->tas_selfservice_time_unit = $rs->getString($startcol + 44);
+            $this->tas_height = $rs->getInt($startcol + 44);
 
-            $this->tas_selfservice_trigger_uid = $rs->getString($startcol + 45);
+            $this->tas_color = $rs->getString($startcol + 45);
 
-            $this->tas_selfservice_execution = $rs->getString($startcol + 46);
+            $this->tas_evn_uid = $rs->getString($startcol + 46);
+
+            $this->tas_boundary = $rs->getString($startcol + 47);
+
+            $this->tas_derivation_screen_tpl = $rs->getString($startcol + 48);
+
+            $this->tas_selfservice_timeout = $rs->getInt($startcol + 49);
+
+            $this->tas_selfservice_time = $rs->getString($startcol + 50);
+
+            $this->tas_selfservice_time_unit = $rs->getString($startcol + 51);
+
+            $this->tas_selfservice_trigger_uid = $rs->getString($startcol + 52);
+
+            $this->tas_selfservice_execution = $rs->getString($startcol + 53);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 47; // 47 = TaskPeer::NUM_COLUMNS - TaskPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 54; // 54 = TaskPeer::NUM_COLUMNS - TaskPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Task object", $e);
@@ -2189,138 +2476,159 @@ abstract class BaseTask extends BaseObject implements Persistent
                 return $this->getTasUid();
                 break;
             case 2:
-                return $this->getTasType();
+                return $this->getTasTitle();
                 break;
             case 3:
-                return $this->getTasDuration();
+                return $this->getTasDescription();
                 break;
             case 4:
-                return $this->getTasDelayType();
+                return $this->getTasDefTitle();
                 break;
             case 5:
-                return $this->getTasTemporizer();
+                return $this->getTasDefSubjectMessage();
                 break;
             case 6:
-                return $this->getTasTypeDay();
+                return $this->getTasDefProcCode();
                 break;
             case 7:
-                return $this->getTasTimeunit();
+                return $this->getTasDefMessage();
                 break;
             case 8:
-                return $this->getTasAlert();
+                return $this->getTasDefDescription();
                 break;
             case 9:
-                return $this->getTasPriorityVariable();
+                return $this->getTasType();
                 break;
             case 10:
-                return $this->getTasAssignType();
+                return $this->getTasDuration();
                 break;
             case 11:
-                return $this->getTasAssignVariable();
+                return $this->getTasDelayType();
                 break;
             case 12:
-                return $this->getTasGroupVariable();
+                return $this->getTasTemporizer();
                 break;
             case 13:
-                return $this->getTasMiInstanceVariable();
+                return $this->getTasTypeDay();
                 break;
             case 14:
-                return $this->getTasMiCompleteVariable();
+                return $this->getTasTimeunit();
                 break;
             case 15:
-                return $this->getTasAssignLocation();
+                return $this->getTasAlert();
                 break;
             case 16:
-                return $this->getTasAssignLocationAdhoc();
+                return $this->getTasPriorityVariable();
                 break;
             case 17:
-                return $this->getTasTransferFly();
+                return $this->getTasAssignType();
                 break;
             case 18:
-                return $this->getTasLastAssigned();
+                return $this->getTasAssignVariable();
                 break;
             case 19:
-                return $this->getTasUser();
+                return $this->getTasGroupVariable();
                 break;
             case 20:
-                return $this->getTasCanUpload();
+                return $this->getTasMiInstanceVariable();
                 break;
             case 21:
-                return $this->getTasViewUpload();
+                return $this->getTasMiCompleteVariable();
                 break;
             case 22:
-                return $this->getTasViewAdditionalDocumentation();
+                return $this->getTasAssignLocation();
                 break;
             case 23:
-                return $this->getTasCanCancel();
+                return $this->getTasAssignLocationAdhoc();
                 break;
             case 24:
-                return $this->getTasOwnerApp();
+                return $this->getTasTransferFly();
                 break;
             case 25:
-                return $this->getStgUid();
+                return $this->getTasLastAssigned();
                 break;
             case 26:
-                return $this->getTasCanPause();
+                return $this->getTasUser();
                 break;
             case 27:
-                return $this->getTasCanSendMessage();
+                return $this->getTasCanUpload();
                 break;
             case 28:
-                return $this->getTasCanDeleteDocs();
+                return $this->getTasViewUpload();
                 break;
             case 29:
-                return $this->getTasSelfService();
+                return $this->getTasViewAdditionalDocumentation();
                 break;
             case 30:
-                return $this->getTasStart();
+                return $this->getTasCanCancel();
                 break;
             case 31:
-                return $this->getTasToLastUser();
+                return $this->getTasOwnerApp();
                 break;
             case 32:
-                return $this->getTasSendLastEmail();
+                return $this->getStgUid();
                 break;
             case 33:
-                return $this->getTasDerivation();
+                return $this->getTasCanPause();
                 break;
             case 34:
-                return $this->getTasPosx();
+                return $this->getTasCanSendMessage();
                 break;
             case 35:
-                return $this->getTasPosy();
+                return $this->getTasCanDeleteDocs();
                 break;
             case 36:
-                return $this->getTasWidth();
+                return $this->getTasSelfService();
                 break;
             case 37:
-                return $this->getTasHeight();
+                return $this->getTasStart();
                 break;
             case 38:
-                return $this->getTasColor();
+                return $this->getTasToLastUser();
                 break;
             case 39:
-                return $this->getTasEvnUid();
+                return $this->getTasSendLastEmail();
                 break;
             case 40:
-                return $this->getTasBoundary();
+                return $this->getTasDerivation();
                 break;
             case 41:
-                return $this->getTasDerivationScreenTpl();
+                return $this->getTasPosx();
                 break;
             case 42:
-                return $this->getTasSelfserviceTimeout();
+                return $this->getTasPosy();
                 break;
             case 43:
-                return $this->getTasSelfserviceTime();
+                return $this->getTasWidth();
                 break;
             case 44:
-                return $this->getTasSelfserviceTimeUnit();
+                return $this->getTasHeight();
                 break;
             case 45:
-                return $this->getTasSelfserviceTriggerUid();
+                return $this->getTasColor();
                 break;
             case 46:
+                return $this->getTasEvnUid();
+                break;
+            case 47:
+                return $this->getTasBoundary();
+                break;
+            case 48:
+                return $this->getTasDerivationScreenTpl();
+                break;
+            case 49:
+                return $this->getTasSelfserviceTimeout();
+                break;
+            case 50:
+                return $this->getTasSelfserviceTime();
+                break;
+            case 51:
+                return $this->getTasSelfserviceTimeUnit();
+                break;
+            case 52:
+                return $this->getTasSelfserviceTriggerUid();
+                break;
+            case 53:
                 return $this->getTasSelfserviceExecution();
                 break;
             default:
@@ -2345,51 +2653,58 @@ abstract class BaseTask extends BaseObject implements Persistent
         $result = array(
             $keys[0] => $this->getProUid(),
             $keys[1] => $this->getTasUid(),
-            $keys[2] => $this->getTasType(),
-            $keys[3] => $this->getTasDuration(),
-            $keys[4] => $this->getTasDelayType(),
-            $keys[5] => $this->getTasTemporizer(),
-            $keys[6] => $this->getTasTypeDay(),
-            $keys[7] => $this->getTasTimeunit(),
-            $keys[8] => $this->getTasAlert(),
-            $keys[9] => $this->getTasPriorityVariable(),
-            $keys[10] => $this->getTasAssignType(),
-            $keys[11] => $this->getTasAssignVariable(),
-            $keys[12] => $this->getTasGroupVariable(),
-            $keys[13] => $this->getTasMiInstanceVariable(),
-            $keys[14] => $this->getTasMiCompleteVariable(),
-            $keys[15] => $this->getTasAssignLocation(),
-            $keys[16] => $this->getTasAssignLocationAdhoc(),
-            $keys[17] => $this->getTasTransferFly(),
-            $keys[18] => $this->getTasLastAssigned(),
-            $keys[19] => $this->getTasUser(),
-            $keys[20] => $this->getTasCanUpload(),
-            $keys[21] => $this->getTasViewUpload(),
-            $keys[22] => $this->getTasViewAdditionalDocumentation(),
-            $keys[23] => $this->getTasCanCancel(),
-            $keys[24] => $this->getTasOwnerApp(),
-            $keys[25] => $this->getStgUid(),
-            $keys[26] => $this->getTasCanPause(),
-            $keys[27] => $this->getTasCanSendMessage(),
-            $keys[28] => $this->getTasCanDeleteDocs(),
-            $keys[29] => $this->getTasSelfService(),
-            $keys[30] => $this->getTasStart(),
-            $keys[31] => $this->getTasToLastUser(),
-            $keys[32] => $this->getTasSendLastEmail(),
-            $keys[33] => $this->getTasDerivation(),
-            $keys[34] => $this->getTasPosx(),
-            $keys[35] => $this->getTasPosy(),
-            $keys[36] => $this->getTasWidth(),
-            $keys[37] => $this->getTasHeight(),
-            $keys[38] => $this->getTasColor(),
-            $keys[39] => $this->getTasEvnUid(),
-            $keys[40] => $this->getTasBoundary(),
-            $keys[41] => $this->getTasDerivationScreenTpl(),
-            $keys[42] => $this->getTasSelfserviceTimeout(),
-            $keys[43] => $this->getTasSelfserviceTime(),
-            $keys[44] => $this->getTasSelfserviceTimeUnit(),
-            $keys[45] => $this->getTasSelfserviceTriggerUid(),
-            $keys[46] => $this->getTasSelfserviceExecution(),
+            $keys[2] => $this->getTasTitle(),
+            $keys[3] => $this->getTasDescription(),
+            $keys[4] => $this->getTasDefTitle(),
+            $keys[5] => $this->getTasDefSubjectMessage(),
+            $keys[6] => $this->getTasDefProcCode(),
+            $keys[7] => $this->getTasDefMessage(),
+            $keys[8] => $this->getTasDefDescription(),
+            $keys[9] => $this->getTasType(),
+            $keys[10] => $this->getTasDuration(),
+            $keys[11] => $this->getTasDelayType(),
+            $keys[12] => $this->getTasTemporizer(),
+            $keys[13] => $this->getTasTypeDay(),
+            $keys[14] => $this->getTasTimeunit(),
+            $keys[15] => $this->getTasAlert(),
+            $keys[16] => $this->getTasPriorityVariable(),
+            $keys[17] => $this->getTasAssignType(),
+            $keys[18] => $this->getTasAssignVariable(),
+            $keys[19] => $this->getTasGroupVariable(),
+            $keys[20] => $this->getTasMiInstanceVariable(),
+            $keys[21] => $this->getTasMiCompleteVariable(),
+            $keys[22] => $this->getTasAssignLocation(),
+            $keys[23] => $this->getTasAssignLocationAdhoc(),
+            $keys[24] => $this->getTasTransferFly(),
+            $keys[25] => $this->getTasLastAssigned(),
+            $keys[26] => $this->getTasUser(),
+            $keys[27] => $this->getTasCanUpload(),
+            $keys[28] => $this->getTasViewUpload(),
+            $keys[29] => $this->getTasViewAdditionalDocumentation(),
+            $keys[30] => $this->getTasCanCancel(),
+            $keys[31] => $this->getTasOwnerApp(),
+            $keys[32] => $this->getStgUid(),
+            $keys[33] => $this->getTasCanPause(),
+            $keys[34] => $this->getTasCanSendMessage(),
+            $keys[35] => $this->getTasCanDeleteDocs(),
+            $keys[36] => $this->getTasSelfService(),
+            $keys[37] => $this->getTasStart(),
+            $keys[38] => $this->getTasToLastUser(),
+            $keys[39] => $this->getTasSendLastEmail(),
+            $keys[40] => $this->getTasDerivation(),
+            $keys[41] => $this->getTasPosx(),
+            $keys[42] => $this->getTasPosy(),
+            $keys[43] => $this->getTasWidth(),
+            $keys[44] => $this->getTasHeight(),
+            $keys[45] => $this->getTasColor(),
+            $keys[46] => $this->getTasEvnUid(),
+            $keys[47] => $this->getTasBoundary(),
+            $keys[48] => $this->getTasDerivationScreenTpl(),
+            $keys[49] => $this->getTasSelfserviceTimeout(),
+            $keys[50] => $this->getTasSelfserviceTime(),
+            $keys[51] => $this->getTasSelfserviceTimeUnit(),
+            $keys[52] => $this->getTasSelfserviceTriggerUid(),
+            $keys[53] => $this->getTasSelfserviceExecution(),
         );
         return $result;
     }
@@ -2428,138 +2743,159 @@ abstract class BaseTask extends BaseObject implements Persistent
                 $this->setTasUid($value);
                 break;
             case 2:
-                $this->setTasType($value);
+                $this->setTasTitle($value);
                 break;
             case 3:
-                $this->setTasDuration($value);
+                $this->setTasDescription($value);
                 break;
             case 4:
-                $this->setTasDelayType($value);
+                $this->setTasDefTitle($value);
                 break;
             case 5:
-                $this->setTasTemporizer($value);
+                $this->setTasDefSubjectMessage($value);
                 break;
             case 6:
-                $this->setTasTypeDay($value);
+                $this->setTasDefProcCode($value);
                 break;
             case 7:
-                $this->setTasTimeunit($value);
+                $this->setTasDefMessage($value);
                 break;
             case 8:
-                $this->setTasAlert($value);
+                $this->setTasDefDescription($value);
                 break;
             case 9:
-                $this->setTasPriorityVariable($value);
+                $this->setTasType($value);
                 break;
             case 10:
-                $this->setTasAssignType($value);
+                $this->setTasDuration($value);
                 break;
             case 11:
-                $this->setTasAssignVariable($value);
+                $this->setTasDelayType($value);
                 break;
             case 12:
-                $this->setTasGroupVariable($value);
+                $this->setTasTemporizer($value);
                 break;
             case 13:
-                $this->setTasMiInstanceVariable($value);
+                $this->setTasTypeDay($value);
                 break;
             case 14:
-                $this->setTasMiCompleteVariable($value);
+                $this->setTasTimeunit($value);
                 break;
             case 15:
-                $this->setTasAssignLocation($value);
+                $this->setTasAlert($value);
                 break;
             case 16:
-                $this->setTasAssignLocationAdhoc($value);
+                $this->setTasPriorityVariable($value);
                 break;
             case 17:
-                $this->setTasTransferFly($value);
+                $this->setTasAssignType($value);
                 break;
             case 18:
-                $this->setTasLastAssigned($value);
+                $this->setTasAssignVariable($value);
                 break;
             case 19:
-                $this->setTasUser($value);
+                $this->setTasGroupVariable($value);
                 break;
             case 20:
-                $this->setTasCanUpload($value);
+                $this->setTasMiInstanceVariable($value);
                 break;
             case 21:
-                $this->setTasViewUpload($value);
+                $this->setTasMiCompleteVariable($value);
                 break;
             case 22:
-                $this->setTasViewAdditionalDocumentation($value);
+                $this->setTasAssignLocation($value);
                 break;
             case 23:
-                $this->setTasCanCancel($value);
+                $this->setTasAssignLocationAdhoc($value);
                 break;
             case 24:
-                $this->setTasOwnerApp($value);
+                $this->setTasTransferFly($value);
                 break;
             case 25:
-                $this->setStgUid($value);
+                $this->setTasLastAssigned($value);
                 break;
             case 26:
-                $this->setTasCanPause($value);
+                $this->setTasUser($value);
                 break;
             case 27:
-                $this->setTasCanSendMessage($value);
+                $this->setTasCanUpload($value);
                 break;
             case 28:
-                $this->setTasCanDeleteDocs($value);
+                $this->setTasViewUpload($value);
                 break;
             case 29:
-                $this->setTasSelfService($value);
+                $this->setTasViewAdditionalDocumentation($value);
                 break;
             case 30:
-                $this->setTasStart($value);
+                $this->setTasCanCancel($value);
                 break;
             case 31:
-                $this->setTasToLastUser($value);
+                $this->setTasOwnerApp($value);
                 break;
             case 32:
-                $this->setTasSendLastEmail($value);
+                $this->setStgUid($value);
                 break;
             case 33:
-                $this->setTasDerivation($value);
+                $this->setTasCanPause($value);
                 break;
             case 34:
-                $this->setTasPosx($value);
+                $this->setTasCanSendMessage($value);
                 break;
             case 35:
-                $this->setTasPosy($value);
+                $this->setTasCanDeleteDocs($value);
                 break;
             case 36:
-                $this->setTasWidth($value);
+                $this->setTasSelfService($value);
                 break;
             case 37:
-                $this->setTasHeight($value);
+                $this->setTasStart($value);
                 break;
             case 38:
-                $this->setTasColor($value);
+                $this->setTasToLastUser($value);
                 break;
             case 39:
-                $this->setTasEvnUid($value);
+                $this->setTasSendLastEmail($value);
                 break;
             case 40:
-                $this->setTasBoundary($value);
+                $this->setTasDerivation($value);
                 break;
             case 41:
-                $this->setTasDerivationScreenTpl($value);
+                $this->setTasPosx($value);
                 break;
             case 42:
-                $this->setTasSelfserviceTimeout($value);
+                $this->setTasPosy($value);
                 break;
             case 43:
-                $this->setTasSelfserviceTime($value);
+                $this->setTasWidth($value);
                 break;
             case 44:
-                $this->setTasSelfserviceTimeUnit($value);
+                $this->setTasHeight($value);
                 break;
             case 45:
-                $this->setTasSelfserviceTriggerUid($value);
+                $this->setTasColor($value);
                 break;
             case 46:
+                $this->setTasEvnUid($value);
+                break;
+            case 47:
+                $this->setTasBoundary($value);
+                break;
+            case 48:
+                $this->setTasDerivationScreenTpl($value);
+                break;
+            case 49:
+                $this->setTasSelfserviceTimeout($value);
+                break;
+            case 50:
+                $this->setTasSelfserviceTime($value);
+                break;
+            case 51:
+                $this->setTasSelfserviceTimeUnit($value);
+                break;
+            case 52:
+                $this->setTasSelfserviceTriggerUid($value);
+                break;
+            case 53:
                 $this->setTasSelfserviceExecution($value);
                 break;
         } // switch()
@@ -2594,183 +2930,211 @@ abstract class BaseTask extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[2], $arr)) {
-            $this->setTasType($arr[$keys[2]]);
+            $this->setTasTitle($arr[$keys[2]]);
         }
 
         if (array_key_exists($keys[3], $arr)) {
-            $this->setTasDuration($arr[$keys[3]]);
+            $this->setTasDescription($arr[$keys[3]]);
         }
 
         if (array_key_exists($keys[4], $arr)) {
-            $this->setTasDelayType($arr[$keys[4]]);
+            $this->setTasDefTitle($arr[$keys[4]]);
         }
 
         if (array_key_exists($keys[5], $arr)) {
-            $this->setTasTemporizer($arr[$keys[5]]);
+            $this->setTasDefSubjectMessage($arr[$keys[5]]);
         }
 
         if (array_key_exists($keys[6], $arr)) {
-            $this->setTasTypeDay($arr[$keys[6]]);
+            $this->setTasDefProcCode($arr[$keys[6]]);
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setTasTimeunit($arr[$keys[7]]);
+            $this->setTasDefMessage($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
-            $this->setTasAlert($arr[$keys[8]]);
+            $this->setTasDefDescription($arr[$keys[8]]);
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setTasPriorityVariable($arr[$keys[9]]);
+            $this->setTasType($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setTasAssignType($arr[$keys[10]]);
+            $this->setTasDuration($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setTasAssignVariable($arr[$keys[11]]);
+            $this->setTasDelayType($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setTasGroupVariable($arr[$keys[12]]);
+            $this->setTasTemporizer($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setTasMiInstanceVariable($arr[$keys[13]]);
+            $this->setTasTypeDay($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setTasMiCompleteVariable($arr[$keys[14]]);
+            $this->setTasTimeunit($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setTasAssignLocation($arr[$keys[15]]);
+            $this->setTasAlert($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setTasAssignLocationAdhoc($arr[$keys[16]]);
+            $this->setTasPriorityVariable($arr[$keys[16]]);
         }
 
         if (array_key_exists($keys[17], $arr)) {
-            $this->setTasTransferFly($arr[$keys[17]]);
+            $this->setTasAssignType($arr[$keys[17]]);
         }
 
         if (array_key_exists($keys[18], $arr)) {
-            $this->setTasLastAssigned($arr[$keys[18]]);
+            $this->setTasAssignVariable($arr[$keys[18]]);
         }
 
         if (array_key_exists($keys[19], $arr)) {
-            $this->setTasUser($arr[$keys[19]]);
+            $this->setTasGroupVariable($arr[$keys[19]]);
         }
 
         if (array_key_exists($keys[20], $arr)) {
-            $this->setTasCanUpload($arr[$keys[20]]);
+            $this->setTasMiInstanceVariable($arr[$keys[20]]);
         }
 
         if (array_key_exists($keys[21], $arr)) {
-            $this->setTasViewUpload($arr[$keys[21]]);
+            $this->setTasMiCompleteVariable($arr[$keys[21]]);
         }
 
         if (array_key_exists($keys[22], $arr)) {
-            $this->setTasViewAdditionalDocumentation($arr[$keys[22]]);
+            $this->setTasAssignLocation($arr[$keys[22]]);
         }
 
         if (array_key_exists($keys[23], $arr)) {
-            $this->setTasCanCancel($arr[$keys[23]]);
+            $this->setTasAssignLocationAdhoc($arr[$keys[23]]);
         }
 
         if (array_key_exists($keys[24], $arr)) {
-            $this->setTasOwnerApp($arr[$keys[24]]);
+            $this->setTasTransferFly($arr[$keys[24]]);
         }
 
         if (array_key_exists($keys[25], $arr)) {
-            $this->setStgUid($arr[$keys[25]]);
+            $this->setTasLastAssigned($arr[$keys[25]]);
         }
 
         if (array_key_exists($keys[26], $arr)) {
-            $this->setTasCanPause($arr[$keys[26]]);
+            $this->setTasUser($arr[$keys[26]]);
         }
 
         if (array_key_exists($keys[27], $arr)) {
-            $this->setTasCanSendMessage($arr[$keys[27]]);
+            $this->setTasCanUpload($arr[$keys[27]]);
         }
 
         if (array_key_exists($keys[28], $arr)) {
-            $this->setTasCanDeleteDocs($arr[$keys[28]]);
+            $this->setTasViewUpload($arr[$keys[28]]);
         }
 
         if (array_key_exists($keys[29], $arr)) {
-            $this->setTasSelfService($arr[$keys[29]]);
+            $this->setTasViewAdditionalDocumentation($arr[$keys[29]]);
         }
 
         if (array_key_exists($keys[30], $arr)) {
-            $this->setTasStart($arr[$keys[30]]);
+            $this->setTasCanCancel($arr[$keys[30]]);
         }
 
         if (array_key_exists($keys[31], $arr)) {
-            $this->setTasToLastUser($arr[$keys[31]]);
+            $this->setTasOwnerApp($arr[$keys[31]]);
         }
 
         if (array_key_exists($keys[32], $arr)) {
-            $this->setTasSendLastEmail($arr[$keys[32]]);
+            $this->setStgUid($arr[$keys[32]]);
         }
 
         if (array_key_exists($keys[33], $arr)) {
-            $this->setTasDerivation($arr[$keys[33]]);
+            $this->setTasCanPause($arr[$keys[33]]);
         }
 
         if (array_key_exists($keys[34], $arr)) {
-            $this->setTasPosx($arr[$keys[34]]);
+            $this->setTasCanSendMessage($arr[$keys[34]]);
         }
 
         if (array_key_exists($keys[35], $arr)) {
-            $this->setTasPosy($arr[$keys[35]]);
+            $this->setTasCanDeleteDocs($arr[$keys[35]]);
         }
 
         if (array_key_exists($keys[36], $arr)) {
-            $this->setTasWidth($arr[$keys[36]]);
+            $this->setTasSelfService($arr[$keys[36]]);
         }
 
         if (array_key_exists($keys[37], $arr)) {
-            $this->setTasHeight($arr[$keys[37]]);
+            $this->setTasStart($arr[$keys[37]]);
         }
 
         if (array_key_exists($keys[38], $arr)) {
-            $this->setTasColor($arr[$keys[38]]);
+            $this->setTasToLastUser($arr[$keys[38]]);
         }
 
         if (array_key_exists($keys[39], $arr)) {
-            $this->setTasEvnUid($arr[$keys[39]]);
+            $this->setTasSendLastEmail($arr[$keys[39]]);
         }
 
         if (array_key_exists($keys[40], $arr)) {
-            $this->setTasBoundary($arr[$keys[40]]);
+            $this->setTasDerivation($arr[$keys[40]]);
         }
 
         if (array_key_exists($keys[41], $arr)) {
-            $this->setTasDerivationScreenTpl($arr[$keys[41]]);
+            $this->setTasPosx($arr[$keys[41]]);
         }
 
         if (array_key_exists($keys[42], $arr)) {
-            $this->setTasSelfserviceTimeout($arr[$keys[42]]);
+            $this->setTasPosy($arr[$keys[42]]);
         }
 
         if (array_key_exists($keys[43], $arr)) {
-            $this->setTasSelfserviceTime($arr[$keys[43]]);
+            $this->setTasWidth($arr[$keys[43]]);
         }
 
         if (array_key_exists($keys[44], $arr)) {
-            $this->setTasSelfserviceTimeUnit($arr[$keys[44]]);
+            $this->setTasHeight($arr[$keys[44]]);
         }
 
         if (array_key_exists($keys[45], $arr)) {
-            $this->setTasSelfserviceTriggerUid($arr[$keys[45]]);
+            $this->setTasColor($arr[$keys[45]]);
         }
 
         if (array_key_exists($keys[46], $arr)) {
-            $this->setTasSelfserviceExecution($arr[$keys[46]]);
+            $this->setTasEvnUid($arr[$keys[46]]);
+        }
+
+        if (array_key_exists($keys[47], $arr)) {
+            $this->setTasBoundary($arr[$keys[47]]);
+        }
+
+        if (array_key_exists($keys[48], $arr)) {
+            $this->setTasDerivationScreenTpl($arr[$keys[48]]);
+        }
+
+        if (array_key_exists($keys[49], $arr)) {
+            $this->setTasSelfserviceTimeout($arr[$keys[49]]);
+        }
+
+        if (array_key_exists($keys[50], $arr)) {
+            $this->setTasSelfserviceTime($arr[$keys[50]]);
+        }
+
+        if (array_key_exists($keys[51], $arr)) {
+            $this->setTasSelfserviceTimeUnit($arr[$keys[51]]);
+        }
+
+        if (array_key_exists($keys[52], $arr)) {
+            $this->setTasSelfserviceTriggerUid($arr[$keys[52]]);
+        }
+
+        if (array_key_exists($keys[53], $arr)) {
+            $this->setTasSelfserviceExecution($arr[$keys[53]]);
         }
 
     }
@@ -2792,6 +3156,34 @@ abstract class BaseTask extends BaseObject implements Persistent
             $criteria->add(TaskPeer::TAS_UID, $this->tas_uid);
         }
 
+        if ($this->isColumnModified(TaskPeer::TAS_TITLE)) {
+            $criteria->add(TaskPeer::TAS_TITLE, $this->tas_title);
+        }
+
+        if ($this->isColumnModified(TaskPeer::TAS_DESCRIPTION)) {
+            $criteria->add(TaskPeer::TAS_DESCRIPTION, $this->tas_description);
+        }
+
+        if ($this->isColumnModified(TaskPeer::TAS_DEF_TITLE)) {
+            $criteria->add(TaskPeer::TAS_DEF_TITLE, $this->tas_def_title);
+        }
+
+        if ($this->isColumnModified(TaskPeer::TAS_DEF_SUBJECT_MESSAGE)) {
+            $criteria->add(TaskPeer::TAS_DEF_SUBJECT_MESSAGE, $this->tas_def_subject_message);
+        }
+
+        if ($this->isColumnModified(TaskPeer::TAS_DEF_PROC_CODE)) {
+            $criteria->add(TaskPeer::TAS_DEF_PROC_CODE, $this->tas_def_proc_code);
+        }
+
+        if ($this->isColumnModified(TaskPeer::TAS_DEF_MESSAGE)) {
+            $criteria->add(TaskPeer::TAS_DEF_MESSAGE, $this->tas_def_message);
+        }
+
+        if ($this->isColumnModified(TaskPeer::TAS_DEF_DESCRIPTION)) {
+            $criteria->add(TaskPeer::TAS_DEF_DESCRIPTION, $this->tas_def_description);
+        }
+
         if ($this->isColumnModified(TaskPeer::TAS_TYPE)) {
             $criteria->add(TaskPeer::TAS_TYPE, $this->tas_type);
         }
@@ -3028,6 +3420,20 @@ abstract class BaseTask extends BaseObject implements Persistent
 
         $copyObj->setProUid($this->pro_uid);
 
+        $copyObj->setTasTitle($this->tas_title);
+
+        $copyObj->setTasDescription($this->tas_description);
+
+        $copyObj->setTasDefTitle($this->tas_def_title);
+
+        $copyObj->setTasDefSubjectMessage($this->tas_def_subject_message);
+
+        $copyObj->setTasDefProcCode($this->tas_def_proc_code);
+
+        $copyObj->setTasDefMessage($this->tas_def_message);
+
+        $copyObj->setTasDefDescription($this->tas_def_description);
+
         $copyObj->setTasType($this->tas_type);
 
         $copyObj->setTasDuration($this->tas_duration);
diff --git a/workflow/engine/classes/model/om/BaseTaskPeer.php b/workflow/engine/classes/model/om/BaseTaskPeer.php
index cc207fec4..8f435b658 100755
--- a/workflow/engine/classes/model/om/BaseTaskPeer.php
+++ b/workflow/engine/classes/model/om/BaseTaskPeer.php
@@ -25,7 +25,7 @@ abstract class BaseTaskPeer
     const CLASS_DEFAULT = 'classes.model.Task';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 47;
+    const NUM_COLUMNS = 54;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -37,6 +37,27 @@ abstract class BaseTaskPeer
     /** the column name for the TAS_UID field */
     const TAS_UID = 'TASK.TAS_UID';
 
+    /** the column name for the TAS_TITLE field */
+    const TAS_TITLE = 'TASK.TAS_TITLE';
+
+    /** the column name for the TAS_DESCRIPTION field */
+    const TAS_DESCRIPTION = 'TASK.TAS_DESCRIPTION';
+
+    /** the column name for the TAS_DEF_TITLE field */
+    const TAS_DEF_TITLE = 'TASK.TAS_DEF_TITLE';
+
+    /** the column name for the TAS_DEF_SUBJECT_MESSAGE field */
+    const TAS_DEF_SUBJECT_MESSAGE = 'TASK.TAS_DEF_SUBJECT_MESSAGE';
+
+    /** the column name for the TAS_DEF_PROC_CODE field */
+    const TAS_DEF_PROC_CODE = 'TASK.TAS_DEF_PROC_CODE';
+
+    /** the column name for the TAS_DEF_MESSAGE field */
+    const TAS_DEF_MESSAGE = 'TASK.TAS_DEF_MESSAGE';
+
+    /** the column name for the TAS_DEF_DESCRIPTION field */
+    const TAS_DEF_DESCRIPTION = 'TASK.TAS_DEF_DESCRIPTION';
+
     /** the column name for the TAS_TYPE field */
     const TAS_TYPE = 'TASK.TAS_TYPE';
 
@@ -183,10 +204,10 @@ abstract class BaseTaskPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', 'TasSelfserviceTimeout', 'TasSelfserviceTime', 'TasSelfserviceTimeUnit', 'TasSelfserviceTriggerUid', 'TasSelfserviceExecution', ),
-        BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, TaskPeer::TAS_SELFSERVICE_TIMEOUT, TaskPeer::TAS_SELFSERVICE_TIME, TaskPeer::TAS_SELFSERVICE_TIME_UNIT, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID, TaskPeer::TAS_SELFSERVICE_EXECUTION, ),
-        BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', 'TAS_SELFSERVICE_TIMEOUT', 'TAS_SELFSERVICE_TIME', 'TAS_SELFSERVICE_TIME_UNIT', 'TAS_SELFSERVICE_TRIGGER_UID', 'TAS_SELFSERVICE_EXECUTION', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, )
+        BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasTitle', 'TasDescription', 'TasDefTitle', 'TasDefSubjectMessage', 'TasDefProcCode', 'TasDefMessage', 'TasDefDescription', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', 'TasSelfserviceTimeout', 'TasSelfserviceTime', 'TasSelfserviceTimeUnit', 'TasSelfserviceTriggerUid', 'TasSelfserviceExecution', ),
+        BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TITLE, TaskPeer::TAS_DESCRIPTION, TaskPeer::TAS_DEF_TITLE, TaskPeer::TAS_DEF_SUBJECT_MESSAGE, TaskPeer::TAS_DEF_PROC_CODE, TaskPeer::TAS_DEF_MESSAGE, TaskPeer::TAS_DEF_DESCRIPTION, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, TaskPeer::TAS_SELFSERVICE_TIMEOUT, TaskPeer::TAS_SELFSERVICE_TIME, TaskPeer::TAS_SELFSERVICE_TIME_UNIT, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID, TaskPeer::TAS_SELFSERVICE_EXECUTION, ),
+        BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', 'TAS_SELFSERVICE_TIMEOUT', 'TAS_SELFSERVICE_TIME', 'TAS_SELFSERVICE_TIME_UNIT', 'TAS_SELFSERVICE_TRIGGER_UID', 'TAS_SELFSERVICE_EXECUTION', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, )
     );
 
     /**
@@ -196,10 +217,10 @@ abstract class BaseTaskPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasType' => 2, 'TasDuration' => 3, 'TasDelayType' => 4, 'TasTemporizer' => 5, 'TasTypeDay' => 6, 'TasTimeunit' => 7, 'TasAlert' => 8, 'TasPriorityVariable' => 9, 'TasAssignType' => 10, 'TasAssignVariable' => 11, 'TasGroupVariable' => 12, 'TasMiInstanceVariable' => 13, 'TasMiCompleteVariable' => 14, 'TasAssignLocation' => 15, 'TasAssignLocationAdhoc' => 16, 'TasTransferFly' => 17, 'TasLastAssigned' => 18, 'TasUser' => 19, 'TasCanUpload' => 20, 'TasViewUpload' => 21, 'TasViewAdditionalDocumentation' => 22, 'TasCanCancel' => 23, 'TasOwnerApp' => 24, 'StgUid' => 25, 'TasCanPause' => 26, 'TasCanSendMessage' => 27, 'TasCanDeleteDocs' => 28, 'TasSelfService' => 29, 'TasStart' => 30, 'TasToLastUser' => 31, 'TasSendLastEmail' => 32, 'TasDerivation' => 33, 'TasPosx' => 34, 'TasPosy' => 35, 'TasWidth' => 36, 'TasHeight' => 37, 'TasColor' => 38, 'TasEvnUid' => 39, 'TasBoundary' => 40, 'TasDerivationScreenTpl' => 41, 'TasSelfserviceTimeout' => 42, 'TasSelfserviceTime' => 43, 'TasSelfserviceTimeUnit' => 44, 'TasSelfserviceTriggerUid' => 45, 'TasSelfserviceExecution' => 46, ),
-        BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TYPE => 2, TaskPeer::TAS_DURATION => 3, TaskPeer::TAS_DELAY_TYPE => 4, TaskPeer::TAS_TEMPORIZER => 5, TaskPeer::TAS_TYPE_DAY => 6, TaskPeer::TAS_TIMEUNIT => 7, TaskPeer::TAS_ALERT => 8, TaskPeer::TAS_PRIORITY_VARIABLE => 9, TaskPeer::TAS_ASSIGN_TYPE => 10, TaskPeer::TAS_ASSIGN_VARIABLE => 11, TaskPeer::TAS_GROUP_VARIABLE => 12, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 13, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 14, TaskPeer::TAS_ASSIGN_LOCATION => 15, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 16, TaskPeer::TAS_TRANSFER_FLY => 17, TaskPeer::TAS_LAST_ASSIGNED => 18, TaskPeer::TAS_USER => 19, TaskPeer::TAS_CAN_UPLOAD => 20, TaskPeer::TAS_VIEW_UPLOAD => 21, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 22, TaskPeer::TAS_CAN_CANCEL => 23, TaskPeer::TAS_OWNER_APP => 24, TaskPeer::STG_UID => 25, TaskPeer::TAS_CAN_PAUSE => 26, TaskPeer::TAS_CAN_SEND_MESSAGE => 27, TaskPeer::TAS_CAN_DELETE_DOCS => 28, TaskPeer::TAS_SELF_SERVICE => 29, TaskPeer::TAS_START => 30, TaskPeer::TAS_TO_LAST_USER => 31, TaskPeer::TAS_SEND_LAST_EMAIL => 32, TaskPeer::TAS_DERIVATION => 33, TaskPeer::TAS_POSX => 34, TaskPeer::TAS_POSY => 35, TaskPeer::TAS_WIDTH => 36, TaskPeer::TAS_HEIGHT => 37, TaskPeer::TAS_COLOR => 38, TaskPeer::TAS_EVN_UID => 39, TaskPeer::TAS_BOUNDARY => 40, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 41, TaskPeer::TAS_SELFSERVICE_TIMEOUT => 42, TaskPeer::TAS_SELFSERVICE_TIME => 43, TaskPeer::TAS_SELFSERVICE_TIME_UNIT => 44, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID => 45, TaskPeer::TAS_SELFSERVICE_EXECUTION => 46, ),
-        BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TYPE' => 2, 'TAS_DURATION' => 3, 'TAS_DELAY_TYPE' => 4, 'TAS_TEMPORIZER' => 5, 'TAS_TYPE_DAY' => 6, 'TAS_TIMEUNIT' => 7, 'TAS_ALERT' => 8, 'TAS_PRIORITY_VARIABLE' => 9, 'TAS_ASSIGN_TYPE' => 10, 'TAS_ASSIGN_VARIABLE' => 11, 'TAS_GROUP_VARIABLE' => 12, 'TAS_MI_INSTANCE_VARIABLE' => 13, 'TAS_MI_COMPLETE_VARIABLE' => 14, 'TAS_ASSIGN_LOCATION' => 15, 'TAS_ASSIGN_LOCATION_ADHOC' => 16, 'TAS_TRANSFER_FLY' => 17, 'TAS_LAST_ASSIGNED' => 18, 'TAS_USER' => 19, 'TAS_CAN_UPLOAD' => 20, 'TAS_VIEW_UPLOAD' => 21, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 22, 'TAS_CAN_CANCEL' => 23, 'TAS_OWNER_APP' => 24, 'STG_UID' => 25, 'TAS_CAN_PAUSE' => 26, 'TAS_CAN_SEND_MESSAGE' => 27, 'TAS_CAN_DELETE_DOCS' => 28, 'TAS_SELF_SERVICE' => 29, 'TAS_START' => 30, 'TAS_TO_LAST_USER' => 31, 'TAS_SEND_LAST_EMAIL' => 32, 'TAS_DERIVATION' => 33, 'TAS_POSX' => 34, 'TAS_POSY' => 35, 'TAS_WIDTH' => 36, 'TAS_HEIGHT' => 37, 'TAS_COLOR' => 38, 'TAS_EVN_UID' => 39, 'TAS_BOUNDARY' => 40, 'TAS_DERIVATION_SCREEN_TPL' => 41, 'TAS_SELFSERVICE_TIMEOUT' => 42, 'TAS_SELFSERVICE_TIME' => 43, 'TAS_SELFSERVICE_TIME_UNIT' => 44, 'TAS_SELFSERVICE_TRIGGER_UID' => 45, 'TAS_SELFSERVICE_EXECUTION' => 46, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, )
+        BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasTitle' => 2, 'TasDescription' => 3, 'TasDefTitle' => 4, 'TasDefSubjectMessage' => 5, 'TasDefProcCode' => 6, 'TasDefMessage' => 7, 'TasDefDescription' => 8, 'TasType' => 9, 'TasDuration' => 10, 'TasDelayType' => 11, 'TasTemporizer' => 12, 'TasTypeDay' => 13, 'TasTimeunit' => 14, 'TasAlert' => 15, 'TasPriorityVariable' => 16, 'TasAssignType' => 17, 'TasAssignVariable' => 18, 'TasGroupVariable' => 19, 'TasMiInstanceVariable' => 20, 'TasMiCompleteVariable' => 21, 'TasAssignLocation' => 22, 'TasAssignLocationAdhoc' => 23, 'TasTransferFly' => 24, 'TasLastAssigned' => 25, 'TasUser' => 26, 'TasCanUpload' => 27, 'TasViewUpload' => 28, 'TasViewAdditionalDocumentation' => 29, 'TasCanCancel' => 30, 'TasOwnerApp' => 31, 'StgUid' => 32, 'TasCanPause' => 33, 'TasCanSendMessage' => 34, 'TasCanDeleteDocs' => 35, 'TasSelfService' => 36, 'TasStart' => 37, 'TasToLastUser' => 38, 'TasSendLastEmail' => 39, 'TasDerivation' => 40, 'TasPosx' => 41, 'TasPosy' => 42, 'TasWidth' => 43, 'TasHeight' => 44, 'TasColor' => 45, 'TasEvnUid' => 46, 'TasBoundary' => 47, 'TasDerivationScreenTpl' => 48, 'TasSelfserviceTimeout' => 49, 'TasSelfserviceTime' => 50, 'TasSelfserviceTimeUnit' => 51, 'TasSelfserviceTriggerUid' => 52, 'TasSelfserviceExecution' => 53, ),
+        BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TITLE => 2, TaskPeer::TAS_DESCRIPTION => 3, TaskPeer::TAS_DEF_TITLE => 4, TaskPeer::TAS_DEF_SUBJECT_MESSAGE => 5, TaskPeer::TAS_DEF_PROC_CODE => 6, TaskPeer::TAS_DEF_MESSAGE => 7, TaskPeer::TAS_DEF_DESCRIPTION => 8, TaskPeer::TAS_TYPE => 9, TaskPeer::TAS_DURATION => 10, TaskPeer::TAS_DELAY_TYPE => 11, TaskPeer::TAS_TEMPORIZER => 12, TaskPeer::TAS_TYPE_DAY => 13, TaskPeer::TAS_TIMEUNIT => 14, TaskPeer::TAS_ALERT => 15, TaskPeer::TAS_PRIORITY_VARIABLE => 16, TaskPeer::TAS_ASSIGN_TYPE => 17, TaskPeer::TAS_ASSIGN_VARIABLE => 18, TaskPeer::TAS_GROUP_VARIABLE => 19, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 20, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 21, TaskPeer::TAS_ASSIGN_LOCATION => 22, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 23, TaskPeer::TAS_TRANSFER_FLY => 24, TaskPeer::TAS_LAST_ASSIGNED => 25, TaskPeer::TAS_USER => 26, TaskPeer::TAS_CAN_UPLOAD => 27, TaskPeer::TAS_VIEW_UPLOAD => 28, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 29, TaskPeer::TAS_CAN_CANCEL => 30, TaskPeer::TAS_OWNER_APP => 31, TaskPeer::STG_UID => 32, TaskPeer::TAS_CAN_PAUSE => 33, TaskPeer::TAS_CAN_SEND_MESSAGE => 34, TaskPeer::TAS_CAN_DELETE_DOCS => 35, TaskPeer::TAS_SELF_SERVICE => 36, TaskPeer::TAS_START => 37, TaskPeer::TAS_TO_LAST_USER => 38, TaskPeer::TAS_SEND_LAST_EMAIL => 39, TaskPeer::TAS_DERIVATION => 40, TaskPeer::TAS_POSX => 41, TaskPeer::TAS_POSY => 42, TaskPeer::TAS_WIDTH => 43, TaskPeer::TAS_HEIGHT => 44, TaskPeer::TAS_COLOR => 45, TaskPeer::TAS_EVN_UID => 46, TaskPeer::TAS_BOUNDARY => 47, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 48, TaskPeer::TAS_SELFSERVICE_TIMEOUT => 49, TaskPeer::TAS_SELFSERVICE_TIME => 50, TaskPeer::TAS_SELFSERVICE_TIME_UNIT => 51, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID => 52, TaskPeer::TAS_SELFSERVICE_EXECUTION => 53, ),
+        BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TITLE' => 2, 'TAS_DESCRIPTION' => 3, 'TAS_DEF_TITLE' => 4, 'TAS_DEF_SUBJECT_MESSAGE' => 5, 'TAS_DEF_PROC_CODE' => 6, 'TAS_DEF_MESSAGE' => 7, 'TAS_DEF_DESCRIPTION' => 8, 'TAS_TYPE' => 9, 'TAS_DURATION' => 10, 'TAS_DELAY_TYPE' => 11, 'TAS_TEMPORIZER' => 12, 'TAS_TYPE_DAY' => 13, 'TAS_TIMEUNIT' => 14, 'TAS_ALERT' => 15, 'TAS_PRIORITY_VARIABLE' => 16, 'TAS_ASSIGN_TYPE' => 17, 'TAS_ASSIGN_VARIABLE' => 18, 'TAS_GROUP_VARIABLE' => 19, 'TAS_MI_INSTANCE_VARIABLE' => 20, 'TAS_MI_COMPLETE_VARIABLE' => 21, 'TAS_ASSIGN_LOCATION' => 22, 'TAS_ASSIGN_LOCATION_ADHOC' => 23, 'TAS_TRANSFER_FLY' => 24, 'TAS_LAST_ASSIGNED' => 25, 'TAS_USER' => 26, 'TAS_CAN_UPLOAD' => 27, 'TAS_VIEW_UPLOAD' => 28, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 29, 'TAS_CAN_CANCEL' => 30, 'TAS_OWNER_APP' => 31, 'STG_UID' => 32, 'TAS_CAN_PAUSE' => 33, 'TAS_CAN_SEND_MESSAGE' => 34, 'TAS_CAN_DELETE_DOCS' => 35, 'TAS_SELF_SERVICE' => 36, 'TAS_START' => 37, 'TAS_TO_LAST_USER' => 38, 'TAS_SEND_LAST_EMAIL' => 39, 'TAS_DERIVATION' => 40, 'TAS_POSX' => 41, 'TAS_POSY' => 42, 'TAS_WIDTH' => 43, 'TAS_HEIGHT' => 44, 'TAS_COLOR' => 45, 'TAS_EVN_UID' => 46, 'TAS_BOUNDARY' => 47, 'TAS_DERIVATION_SCREEN_TPL' => 48, 'TAS_SELFSERVICE_TIMEOUT' => 49, 'TAS_SELFSERVICE_TIME' => 50, 'TAS_SELFSERVICE_TIME_UNIT' => 51, 'TAS_SELFSERVICE_TRIGGER_UID' => 52, 'TAS_SELFSERVICE_EXECUTION' => 53, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, )
     );
 
     /**
@@ -304,6 +325,20 @@ abstract class BaseTaskPeer
 
         $criteria->addSelectColumn(TaskPeer::TAS_UID);
 
+        $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+
+        $criteria->addSelectColumn(TaskPeer::TAS_DESCRIPTION);
+
+        $criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
+
+        $criteria->addSelectColumn(TaskPeer::TAS_DEF_SUBJECT_MESSAGE);
+
+        $criteria->addSelectColumn(TaskPeer::TAS_DEF_PROC_CODE);
+
+        $criteria->addSelectColumn(TaskPeer::TAS_DEF_MESSAGE);
+
+        $criteria->addSelectColumn(TaskPeer::TAS_DEF_DESCRIPTION);
+
         $criteria->addSelectColumn(TaskPeer::TAS_TYPE);
 
         $criteria->addSelectColumn(TaskPeer::TAS_DURATION);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 07724680b..4882c66ca 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -1251,6 +1251,15 @@
     </vendor>
     <column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
     <column name="TAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
+
+    <column name="TAS_TITLE" type="LONGVARCHAR" required="true"/>
+    <column name="TAS_DESCRIPTION" type="LONGVARCHAR"/>
+    <column name="TAS_DEF_TITLE" type="LONGVARCHAR"/>
+    <column name="TAS_DEF_SUBJECT_MESSAGE" type="LONGVARCHAR"/>
+    <column name="TAS_DEF_PROC_CODE" type="LONGVARCHAR"/>
+    <column name="TAS_DEF_MESSAGE" type="LONGVARCHAR"/>
+    <column name="TAS_DEF_DESCRIPTION" type="LONGVARCHAR"/>
+
     <column name="TAS_TYPE" type="VARCHAR" size="50" required="true" default="NORMAL"/>
     <column name="TAS_DURATION" type="DOUBLE" required="true" default="0"/>
     <column name="TAS_DELAY_TYPE" type="VARCHAR" size="30" required="true" default=""/>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 30681a5c0..97f79fa1a 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -601,6 +601,13 @@ CREATE TABLE `TASK`
 (
 	`PRO_UID` VARCHAR(32) default '' NOT NULL,
 	`TAS_UID` VARCHAR(32) default '' NOT NULL,
+	`TAS_TITLE` MEDIUMTEXT  NOT NULL,
+	`TAS_DESCRIPTION` MEDIUMTEXT,
+	`TAS_DEF_TITLE` MEDIUMTEXT,
+	`TAS_DEF_SUBJECT_MESSAGE` MEDIUMTEXT,
+	`TAS_DEF_PROC_CODE` MEDIUMTEXT,
+	`TAS_DEF_MESSAGE` MEDIUMTEXT,
+	`TAS_DEF_DESCRIPTION` MEDIUMTEXT,
 	`TAS_TYPE` VARCHAR(50) default 'NORMAL' NOT NULL,
 	`TAS_DURATION` DOUBLE default 0 NOT NULL,
 	`TAS_DELAY_TYPE` VARCHAR(30) default '' NOT NULL,
diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
index ba4f399c0..2305e6256 100644
--- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
+++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
@@ -19,10 +19,8 @@ $usrUid = $_SESSION["USER_LOGGED"];
 $oCriteria = new Criteria("workflow");
 $oCriteria->addSelectColumn("*");
 $oCriteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID);
-$oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,ContentPeer::CON_ID, Criteria::LEFT_JOIN);
+$oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
 $oCriteria->addJoin(CaseConsolidatedCorePeer::TAS_UID,TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
-$oCriteria->addAnd(ContentPeer::CON_CATEGORY, "TAS_TITLE");
-$oCriteria->addAnd(ContentPeer::CON_LANG, "en");
 
 $params = array(); //This will be filled with the parameters
 $sql = BasePeer::createSelectSql($oCriteria, $params);
diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php
index f5554f8cc..4095ee3ce 100755
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -183,34 +183,25 @@ function lookinginforContentProcess ($sproUid)
 
         $oC = new Criteria( 'workflow' );
         $oC->addSelectColumn( TaskPeer::TAS_UID );
+        $oC->addSelectColumn( TaskPeer::TAS_TITLE );
         $oC->add( TaskPeer::PRO_UID, $sproUid );
         $oDataset1 = TaskPeer::doSelectRS( $oC );
         $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
 
         while ($oDataset1->next()) {
             $aRow1 = $oDataset1->getRow();
-
-            $oCriteria1 = new Criteria( 'workflow' );
-            $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE' );
-            $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
-            $oCriteria1->add( ContentPeer::CON_ID, $aRow1['TAS_UID'] );
-            $oDataset2 = ContentPeer::doSelectRS( $oCriteria1 );
-            $oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset2->next();
-            $aRow2 = $oDataset2->getRow();
-
-            Content::insertContent( 'TAS_TITLE', '', $aRow2['CON_ID'], 'en', $aRow2['CON_VALUE'] );
+            Content::insertContent( 'TAS_TITLE', '', $aRow1['TAS_UID'], 'en', $aRow1['TAS_TITLE'] );
         }
         $oC2 = new Criteria( 'workflow' );
-        $oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-        $oC2->add( ContentPeer::CON_LANG, SYS_LANG );
-        $oC2->add( ContentPeer::CON_ID, $sproUid );
-        $oDataset3 = ContentPeer::doSelectRS( $oC2 );
+        $oC2->addSelectColumn(ProcessPeer::PRO_UID);
+        $oC2->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $oC2->add( ProcessPeer::PRO_UID, $sproUid );
+        $oDataset3 = ProcessPeer::doSelectRS( $oC2 );
         $oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC );
         $oDataset3->next();
         $aRow3 = $oDataset3->getRow();
 
-        Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] );
+        Content::insertContent( 'PRO_TITLE', '', $aRow3['PRO_UID'], 'en', $aRow3['PRO_TITLE'] );
 
     }
     return 1;
diff --git a/workflow/engine/methods/tracker/tracker_Ajax.php b/workflow/engine/methods/tracker/tracker_Ajax.php
index 65f4a8f37..ea233a815 100755
--- a/workflow/engine/methods/tracker/tracker_Ajax.php
+++ b/workflow/engine/methods/tracker/tracker_Ajax.php
@@ -407,14 +407,9 @@ try {
             $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
             $oCriteria = new Criteria( 'workflow' );
             $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
-            $oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE );
-            $aConditions = array ();
-            $aConditions[] = array (0 => TaskPeer::TAS_UID,1 => ContentPeer::CON_ID);
-            $aConditions[] = array (0 => ContentPeer::CON_CATEGORY,1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter());
-            $aConditions[] = array (0 => ContentPeer::CON_LANG,1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-            $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+            $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
             $oCriteria->add( TaskPeer::STG_UID, $oData->stg_uid );
-            $oCriteria->addAscendingOrderByColumn( 'TAS_TITLE' );
+            $oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
             global $G_PUBLISH;
             $G_PUBLISH = new Publisher();
             $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_StageTasks', $oCriteria, array ('PRO_UID' => $oData->pro_uid,'STG_UID' => $oData->stg_uid) );
@@ -425,15 +420,10 @@ try {
             require_once 'classes/model/Task.php';
             $oCriteria = new Criteria( 'workflow' );
             $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
-            $oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE );
-            $aConditions = array ();
-            $aConditions[] = array (0 => TaskPeer::TAS_UID,1 => ContentPeer::CON_ID );
-            $aConditions[] = array (0 => ContentPeer::CON_CATEGORY,1 => DBAdapter::getStringDelimiter() . 'TAS_TITLE' . DBAdapter::getStringDelimiter());
-            $aConditions[] = array (0 => ContentPeer::CON_LANG,1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-            $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+            $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
             $oCriteria->add( TaskPeer::PRO_UID, $_POST['PRO_UID'] );
             $oCriteria->add( TaskPeer::STG_UID, '' );
-            $oCriteria->addAscendingOrderByColumn( 'TAS_TITLE' );
+            $oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
             global $G_PUBLISH;
             $G_PUBLISH = new Publisher();
             $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_AvailableStageTasks', $oCriteria, array ('STG_UID' => $_POST['STG_UID']) );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 798dfbf63..418a09032 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -2071,8 +2071,8 @@ class Cases
             $criteria = new \Criteria("workflow");
 
             $criteria->addSelectColumn(\TaskPeer::TAS_UID);
-            $criteria->addAsColumn("TAS_TITLE", "CT.CON_VALUE");
-            $criteria->addAsColumn("TAS_DESCRIPTION", "CD.CON_VALUE");
+            $criteria->addSelectColumn(\TaskPeer::TAS_TITLE);
+            $criteria->addSelectColumn(\TaskPeer::TAS_DESCRIPTION);
             $criteria->addSelectColumn(\TaskPeer::TAS_START);
             $criteria->addSelectColumn(\TaskPeer::TAS_TYPE);
             $criteria->addSelectColumn(\TaskPeer::TAS_DERIVATION);
@@ -2082,21 +2082,6 @@ class Cases
             $criteria->addSelectColumn(\UsersPeer::USR_FIRSTNAME);
             $criteria->addSelectColumn(\UsersPeer::USR_LASTNAME);
 
-            $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
-            $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\TaskPeer::TAS_UID, "CT.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "TAS_TITLE" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
-            $arrayCondition = array();
-            $arrayCondition[] = array(\TaskPeer::TAS_UID, "CD.CON_ID", \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "TAS_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
-            $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-            $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
             $criteria->addJoin(\TaskPeer::TAS_LAST_ASSIGNED, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
 
             $criteria->add(\TaskPeer::PRO_UID, $processUid, \Criteria::EQUAL);
@@ -2120,24 +2105,9 @@ class Cases
                     $criteria2 = new \Criteria("workflow");
 
                     $criteria2->addSelectColumn(\SubProcessPeer::PRO_UID);
-                    $criteria2->addAsColumn("TAS_TITLE", "CT.CON_VALUE");
-                    $criteria2->addAsColumn("TAS_DESCRIPTION", "CD.CON_VALUE");
-
-                    $criteria2->addAlias("CT", \ContentPeer::TABLE_NAME);
-                    $criteria2->addAlias("CD", \ContentPeer::TABLE_NAME);
-
-                    $arrayCondition = array();
-                    $arrayCondition[] = array(\SubProcessPeer::TAS_PARENT, "CT.CON_ID", \Criteria::EQUAL);
-                    $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "TAS_TITLE" . $delimiter, \Criteria::EQUAL);
-                    $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-                    $criteria2->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
-                    $arrayCondition = array();
-                    $arrayCondition[] = array(\SubProcessPeer::TAS_PARENT, "CD.CON_ID", \Criteria::EQUAL);
-                    $arrayCondition[] = array("CD.CON_CATEGORY", $delimiter . "TAS_DESCRIPTION" . $delimiter, \Criteria::EQUAL);
-                    $arrayCondition[] = array("CD.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
-                    $criteria2->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
-
+                    $criteria2->addSelectColumn(\TaskPeer::TAS_TITLE);
+                    $criteria2->addSelectColumn(\TaskPeer::TAS_DESCRIPTION);
+                    $criteria2->addJoin(\SubProcessPeer::TAS_PARENT, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN);
                     $criteria2->add(\SubProcessPeer::PRO_PARENT, $processUid);
                     $criteria2->add(\SubProcessPeer::TAS_PARENT, $row["TAS_UID"]);
 
@@ -2640,6 +2610,7 @@ class Cases
             $c = new \Criteria();
             $c->clearSelectColumns();
             $c->addSelectColumn(\TaskPeer::TAS_UID);
+            $c->addSelectColumn(\TaskPeer::TAS_TITLE);
             $c->addSelectColumn(\TaskPeer::PRO_UID);
             $c->addSelectColumn(\ProcessPeer::PRO_TITLE);
             $c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN);
@@ -2649,20 +2620,6 @@ class Cases
             $c->add(\TaskUserPeer::USR_UID, $groups, \Criteria::IN);
             $c->add(\TaskPeer::TAS_UID, $bookmark, \Criteria::IN);
 
-            $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-            $c->addAlias("C1", 'CONTENT');
-            $tasTitleConds = array();
-            $tasTitleConds[] = array(\TaskPeer::TAS_UID, 'C1.CON_ID');
-            $tasTitleConds[] = array(
-                'C1.CON_CATEGORY',
-                \DBAdapter::getStringDelimiter() . 'TAS_TITLE' . \DBAdapter::getStringDelimiter()
-            );
-            $tasTitleConds[] = array(
-                'C1.CON_LANG',
-                \DBAdapter::getStringDelimiter() . SYS_LANG . \DBAdapter::getStringDelimiter()
-            );
-            $c->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
-
             if ($typeView == 'category') {
                 $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
                 $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index ec5769162..ce0eb08e3 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -327,39 +327,26 @@ class Light
         $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
         $oDataset->next();
         $aRow = $oDataset->getRow();
-        if (! is_array( $aRow )) {
-
-            $oC = new \Criteria( 'workflow' );
-            $oC->addSelectColumn( \TaskPeer::TAS_UID );
-            $oC->add( \TaskPeer::PRO_UID, $sproUid );
-            $oDataset1 = \TaskPeer::doSelectRS( $oC );
-            $oDataset1->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
-
+        if (!is_array($aRow)) {
+            $oC = new \Criteria('workflow');
+            $oC->addSelectColumn(\TaskPeer::TAS_UID);
+            $oC->addSelectColumn(\TaskPeer::TAS_TITLE);
+            $oC->add(\TaskPeer::PRO_UID, $sproUid);
+            $oDataset1 = \TaskPeer::doSelectRS($oC);
+            $oDataset1->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             while ($oDataset1->next()) {
                 $aRow1 = $oDataset1->getRow();
-
-                $oCriteria1 = new \Criteria( 'workflow' );
-                $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE' );
-                $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
-                $oCriteria1->add( ContentPeer::CON_ID, $aRow1['TAS_UID'] );
-                $oDataset2 = ContentPeer::doSelectRS( $oCriteria1 );
-                $oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-                $oDataset2->next();
-                $aRow2 = $oDataset2->getRow();
-
-                Content::insertContent( 'TAS_TITLE', '', $aRow2['CON_ID'], 'en', $aRow2['CON_VALUE'] );
+                \Content::insertContent('TAS_TITLE', '', $aRow1['TAS_UID'], 'en', $aRow1['TAS_TITLE']);
             }
-            $oC2 = new Criteria( 'workflow' );
-            $oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-            $oC2->add( ContentPeer::CON_LANG, SYS_LANG );
-            $oC2->add( ContentPeer::CON_ID, $sproUid );
-            $oDataset3 = ContentPeer::doSelectRS( $oC2 );
-            $oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oC2 = new Criteria('workflow');
+            $oC2->addSelectColumn(\ProcessPeer::PRO_UID);
+            $oC2->addSelectColumn(\ProcessPeer::PRO_TITLE);
+            $oC2->add(\ProcessPeer::PRO_UID, $sproUid);
+            $oDataset3 = \ProcessPeer::doSelectRS($oC2);
+            $oDataset3->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $oDataset3->next();
             $aRow3 = $oDataset3->getRow();
-
-            Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] );
-
+            \Content::insertContent('PRO_TITLE', '', $aRow3['PRO_UID'], 'en', $aRow3['PRO_TITLE']);
         }
         return 1;
 

From 4780c3fb41f28f7571a1fa754362241d2cdb109a Mon Sep 17 00:00:00 2001
From: qronald <ronald.quenta@processmaker.com>
Date: Mon, 11 Jul 2016 08:55:57 -0400
Subject: [PATCH 12/16] up observations

---
 workflow/engine/classes/model/AppEvent.php      | 11 ++---------
 workflow/engine/classes/model/ListCanceled.php  | 10 ++++------
 workflow/engine/classes/model/ListCompleted.php | 10 ++++------
 workflow/engine/classes/model/ListPaused.php    | 10 ++++------
 workflow/engine/methods/setup/language_Ajax.php | 11 ++++-------
 5 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php
index 1f51d5137..8e0d1f4d1 100755
--- a/workflow/engine/classes/model/AppEvent.php
+++ b/workflow/engine/classes/model/AppEvent.php
@@ -125,9 +125,9 @@ class AppEvent extends BaseAppEvent
             $oCriteria->addSelectColumn( EventPeer::PRO_UID );
             $oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS );
             $oCriteria->addSelectColumn( EventPeer::EVN_ACTION );
+            $oCriteria->addSelectColumn( ApplicationPeer::APP_TITLE );
             $oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' );
             $oCriteria->addAsColumn( 'TAS_TITLE', 'C2.CON_VALUE' );
-            $oCriteria->addAsColumn( 'APP_TITLE', 'C3.CON_VALUE' );
             $oCriteria->addAsColumn( 'PRO_TITLE', 'C4.CON_VALUE' );
             $oCriteria->addAlias( 'C1', 'CONTENT' );
             $oCriteria->addAlias( 'C2', 'CONTENT' );
@@ -157,14 +157,7 @@ class AppEvent extends BaseAppEvent
             $aConditions[] = array ('C2.CON_LANG',$del . SYS_LANG . $del
             );
             $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
-            $aConditions = array ();
-            $aConditions[] = array (AppDelegationPeer::APP_UID,'C3.CON_ID'
-            );
-            $aConditions[] = array ('C3.CON_CATEGORY',$del . 'APP_TITLE' . $del
-            );
-            $aConditions[] = array ('C3.CON_LANG',$del . SYS_LANG . $del
-            );
-            $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+            $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
             $aConditions = array ();
             $aConditions[] = array (AppDelegationPeer::PRO_UID,'C4.CON_ID'
             );
diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php
index bdd257839..9ecdd0712 100644
--- a/workflow/engine/classes/model/ListCanceled.php
+++ b/workflow/engine/classes/model/ListCanceled.php
@@ -25,15 +25,13 @@ class ListCanceled extends BaseListCanceled {
     public function create($data)
     {
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
+        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TITLE'] = $aRow['APP_TITLE'];
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(ContentPeer::CON_VALUE);
diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index b16026c8a..39f353a84 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -35,15 +35,13 @@ class ListCompleted extends BaseListCompleted
         }
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
+        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TITLE'] = $aRow['APP_TITLE'];
 
 
         $criteria = new Criteria();
diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php
index 7ae10ec38..60be556db 100644
--- a/workflow/engine/classes/model/ListPaused.php
+++ b/workflow/engine/classes/model/ListPaused.php
@@ -25,15 +25,13 @@ class ListPaused extends BaseListPaused {
     public function create($data)
     {
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
+        $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
+        $dataset = ApplicationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TITLE'] = $aRow['APP_TITLE'];
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(ContentPeer::CON_VALUE);
diff --git a/workflow/engine/methods/setup/language_Ajax.php b/workflow/engine/methods/setup/language_Ajax.php
index fad0d0b42..b322c4352 100755
--- a/workflow/engine/methods/setup/language_Ajax.php
+++ b/workflow/engine/methods/setup/language_Ajax.php
@@ -147,16 +147,13 @@ try {
 
             $oCriteria = new Criteria( 'workflow' );
             //$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')');
-            $oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
-            $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
-            $oCriteria->add( ContentPeer::CON_LANG, $locale );
-            $oCriteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
-            $oDataset = ContentPeer::doSelectRS( $oCriteria );
-
+            $oCriteria->addSelectColumn(ApplicationPeer::APP_TITLE);
+            $oDataset = ApplicationPeer::doSelectRS( $oCriteria );
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
-            $oContent = new Content();
             $aRow = $oDataset->getRow();
 
+            $oContent = new Content();
             if($locale != "en"){ //Default Lengage 'en'
             	if($locale != SYS_LANG){ //Current lenguage
             		//THERE IS NO ANY CASE STARTED FROM THES LANGUAGE

From 8f7501e2ce25e8ce060ae056ecc5daab565b1897 Mon Sep 17 00:00:00 2001
From: qronald <ronald.quenta@processmaker.com>
Date: Mon, 18 Jul 2016 14:13:01 -0400
Subject: [PATCH 13/16] HOR-1344 Optimization: Lists tables

---
 workflow/engine/classes/class.AppSolr.php     | 38 +++------
 workflow/engine/classes/class.case.php        | 84 +++++--------------
 workflow/engine/classes/class.pmFunctions.php | 15 +++-
 workflow/engine/classes/class.processMap.php  | 57 +++++--------
 workflow/engine/classes/class.report.php      | 55 +++---------
 workflow/engine/classes/class.wsBase.php      | 12 +--
 .../engine/classes/model/AdditionalTables.php |  9 +-
 workflow/engine/classes/model/AppEvent.php    | 28 ++-----
 .../engine/classes/model/ListCanceled.php     | 24 +++---
 .../engine/classes/model/ListCompleted.php    | 16 ++--
 workflow/engine/classes/model/ListInbox.php   | 40 +++------
 workflow/engine/classes/model/ListPaused.php  | 24 +++---
 .../engine/classes/model/ListUnassigned.php   | 20 ++---
 workflow/engine/classes/model/Step.php        |  6 +-
 workflow/engine/controllers/appProxy.php      | 11 ++-
 workflow/engine/methods/cases/casesDemo.php   |  8 +-
 .../methods/cases/casesStartPage_Ajax.php     |  6 +-
 workflow/engine/methods/mails/emailsAjax.php  | 15 +---
 .../methods/processes/processes_Save.php      |  4 +-
 workflow/engine/methods/users/users_Ajax.php  | 10 +--
 .../methods/users/users_ReassignCases.php     | 11 +--
 .../src/ProcessMaker/BusinessModel/Cases.php  |  9 +-
 .../src/ProcessMaker/BusinessModel/Light.php  | 20 ++---
 .../ProcessMaker/BusinessModel/Subprocess.php | 12 +--
 24 files changed, 168 insertions(+), 366 deletions(-)

diff --git a/workflow/engine/classes/class.AppSolr.php b/workflow/engine/classes/class.AppSolr.php
index 4d41c9077..937f2406b 100755
--- a/workflow/engine/classes/class.AppSolr.php
+++ b/workflow/engine/classes/class.AppSolr.php
@@ -834,7 +834,7 @@ class AppSolr
     $c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME');
     $c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID');
   
-    $c->addAsColumn ('APP_TAS_TITLE', 'ctastitle.CON_VALUE');
+    $c->addAsColumn ('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
     $c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS');
   
     $c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE);
@@ -853,7 +853,6 @@ class AppSolr
     $c->addAlias ('u', 'USERS');
     $c->addAlias ('uprev', 'USERS');
     $c->addAlias ('adprev', 'APP_DELEGATION');
-    $c->addAlias ('ctastitle', 'CONTENT');
     $c->addAlias ('at', 'APP_THREAD');
   
     $aConditions = array ();
@@ -880,14 +879,9 @@ class AppSolr
         'adprev.DEL_INDEX'
     );
     $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-  
-    $aConditions = array ();
-    $aConditions [] = array (
-        AppDelegationPeer::TAS_UID,
-        'ctastitle.CON_ID'
-    );
-    $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-  
+
+    $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID);
+
     $aConditions = array ();
     $aConditions [] = array (
         'adprev.USR_UID',
@@ -908,10 +902,7 @@ class AppSolr
   
     $c->add (AppDelegationPeer::APP_UID, $aappUIDs, Criteria::IN );
     //$c->add (AppDelegationPeer::DEL_INDEX, $delIndex);
-  
-    $c->add ('ctastitle.CON_CATEGORY', 'TAS_TITLE');
-    $c->add ('ctastitle.CON_LANG', 'en');
-  
+
     $rs = AppDelegationPeer::doSelectRS ($c);
     $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
     // echo $c->toString();
@@ -954,7 +945,7 @@ class AppSolr
     $c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME');
     $c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID');
     
-    $c->addAsColumn ('APP_TAS_TITLE', 'ctastitle.CON_VALUE');
+    $c->addAsColumn ('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
     $c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS');
     
     $c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE);
@@ -973,7 +964,6 @@ class AppSolr
     $c->addAlias ('u', 'USERS');
     $c->addAlias ('uprev', 'USERS');
     $c->addAlias ('adprev', 'APP_DELEGATION');
-    $c->addAlias ('ctastitle', 'CONTENT');
     $c->addAlias ('at', 'APP_THREAD');
     
     $aConditions = array ();
@@ -993,14 +983,9 @@ class AppSolr
         'adprev.DEL_INDEX' 
     );
     $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-    
-    $aConditions = array ();
-    $aConditions [] = array (
-        AppDelegationPeer::TAS_UID,
-        'ctastitle.CON_ID' 
-    );
-    $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
-    
+
+    $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID);
+
     $aConditions = array ();
     $aConditions [] = array (
         'adprev.USR_UID',
@@ -1021,10 +1006,7 @@ class AppSolr
     
     $c->add (AppDelegationPeer::APP_UID, $appUID);
     $c->add (AppDelegationPeer::DEL_INDEX, $delIndex);
-    
-    $c->add ('ctastitle.CON_CATEGORY', 'TAS_TITLE');
-    $c->add ('ctastitle.CON_LANG', 'en');
-    
+
     $rs = AppDelegationPeer::doSelectRS ($c);
     $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
     // echo $c->toString();
diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 43c19299a..b11a43739 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -204,7 +204,7 @@ class Cases
         $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
-        $c->addAscendingOrderByColumn('PRO_TITLE');
+        $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
         $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -303,8 +303,8 @@ class Cases
         $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
 
-        $c->addAscendingOrderByColumn('PRO_TITLE');
-        $c->addAscendingOrderByColumn('TAS_TITLE');
+        $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
+        $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
 
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -413,8 +413,8 @@ class Cases
         $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
-        $c->addAscendingOrderByColumn('PRO_TITLE');
-        $c->addAscendingOrderByColumn('TAS_TITLE');
+        $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
+        $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $rs->next();
@@ -2521,7 +2521,6 @@ class Cases
     public function getTransferHistoryCriteria($sAppUid)
     {
         $c = new Criteria('workflow');
-        $c->addAsColumn('TAS_TITLE', 'TAS_TITLE.CON_VALUE');
         $c->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $c->addSelectColumn(UsersPeer::USR_LASTNAME);
         $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -2545,6 +2544,7 @@ class Cases
         $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
         $c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE);
         $c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE);
+        $c->addSelectColumn(TaskPeer::TAS_TITLE);
         //APP_DELEGATION LEFT JOIN USERS
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
@@ -2557,14 +2557,8 @@ class Cases
         $app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID);
         $c->addJoinMC($app, Criteria::LEFT_JOIN);
 
-        //LEFT JOIN CONTENT TAS_TITLE
-        $c->addAlias("TAS_TITLE", 'CONTENT');
-        $del = DBAdapter::getStringDelimiter();
-        $appTitleConds = array();
-        $appTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-        $appTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-        $appTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
+        //LEFT JOIN TASK TAS_TITLE
+        $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
 
         //WHERE
         $c->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -2673,7 +2667,7 @@ class Cases
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
+        $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
         $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
@@ -2682,24 +2676,17 @@ class Cases
             APP_LAST_USER.USR_FIRSTNAME)"
         );
 
-        $c->addAlias("PRO_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
         $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
+        $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
         $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
         $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
         $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
-        $del = DBAdapter::getStringDelimiter();
-        $proTitleConds = array();
-        $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
-        $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
-        $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
-
         $prevConds = array();
         $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
         $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
@@ -2903,26 +2890,17 @@ class Cases
                 $c->addSelectColumn(UsersPeer::USR_UID);
                 $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
                 $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-                $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
+                $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
                 $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
 
-                $c->addAlias("PRO_TITLE", 'CONTENT');
-
                 $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
+                $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
                 $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
                 $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
                 $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
                 $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
                 $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
-                $del = DBAdapter::getStringDelimiter();
-                //
-                $proTitleConds = array();
-                $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
-                $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
-                $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
-                $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
-
                 $c->add(AppDelegationPeer::USR_UID, '');
                 $c->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
                 break;
@@ -3057,16 +3035,13 @@ class Cases
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
         if ($titles) {
             $c->addSelectColumn(ApplicationPeer::APP_TITLE);
-            $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
+            $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
             $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         }
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
 
-        if ($titles) {
-            $c->addAlias("PRO_TITLE", 'CONTENT');
-        }
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
@@ -3078,12 +3053,7 @@ class Cases
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
         if ($titles) {
-            $del = DBAdapter::getStringDelimiter();
-            $proTitleConds = array();
-            $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
-            $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
-            $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
-            $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
+            $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         }
 
         $prevConds = array();
@@ -3142,30 +3112,23 @@ class Cases
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
+        $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
         $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
 
-        $c->addAlias("PRO_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
         $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
+        $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
         $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
         $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
         $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
-        $del = DBAdapter::getStringDelimiter();
-        $proTitleConds = array();
-        $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
-        $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
-        $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
-
         $prevConds = array();
         $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
         $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
@@ -5343,7 +5306,9 @@ class Cases
                     $appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $aTask['DEL_INDEX']);
 
                     if (!is_null($appDelegation)) {
-                        $arrayData2['TAS_TITLE'] = Content::load('TAS_TITLE', '', $appDelegation->getTasUid(), SYS_LANG);
+                        $oTask = new Task();
+                        $aTask = $oTask->load($appDelegation->getTasUid());
+                        $arrayData2['TAS_TITLE'] = $aTask['TAS_TITLE'];
                         $arrayData2['DEL_TASK_DUE_DATE'] = $appDelegation->getDelTaskDueDate();
                     }
                 } else {
@@ -6706,31 +6671,24 @@ class Cases
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
         $c->addSelectColumn(ApplicationPeer::APP_STATUS);
-        $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
+        $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE);
         $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE);
         //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
         $c->addAsColumn(
                 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"
         );
 
-        $c->addAlias("PRO_TITLE", 'CONTENT');
         $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
         $c->addAlias("APP_LAST_USER", 'USERS');
 
         $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
+        $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
         $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID);
         $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX);
         $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN);
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
-        $del = DBAdapter::getStringDelimiter();
-        $proTitleConds = array();
-        $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
-        $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
-        $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN);
-
         $prevConds = array();
         $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID');
         $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS);
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index c3f555bc6..5ce6775e7 100755
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -3252,7 +3252,20 @@ function PMFGetGroupUID($groupName)
  */
 function PMFGetTaskUID($taskName, $proUid = null)
 {
-    return PMFGetUidFromText($taskName, 'TAS_TITLE', $proUid);
+    $oCriteria = new Criteria('workflow');
+    $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
+    $oCriteria->add(TaskPeer::TAS_TITLE, $taskName);
+    if(!is_null($proUid)){
+        $oCriteria->add(TaskPeer::PRO_UID, $proUid);
+    }
+    $oDataset = TaskPeer::doSelectRS($oCriteria);
+    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+    $uids = array();
+    while ($row = $oDataset->getRow()) {
+        $uids[] = $row['TAS_UID'];
+        $oDataset->next();
+    }
+    return $uids;
 }
 
 /**
diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 6d68a6416..676684fe2 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -123,18 +123,9 @@ class processMap
                     $oTask->label = htmlentities($aRow1['TAS_TITLE'], ENT_QUOTES, 'UTF-8');
                 } else {
                     $oCriteria = new Criteria('workflow');
-                    $del = DBAdapter::getStringDelimiter();
                     $oCriteria->add(SubProcessPeer::PRO_PARENT, $aRow1['PRO_UID']);
                     $oCriteria->add(SubProcessPeer::TAS_PARENT, $aRow1['TAS_UID']);
-
-                    $oCriteria->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
-                    $oCriteria->addAlias("C1", 'CONTENT');
-                    $tasTitleConds = array();
-                    $tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
-                    $tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
-                    $tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del);
-                    $oCriteria->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
-
+                    $oCriteria->addJoin(SubProcessPeer::TAS_PARENT, TaskPeer::TAS_UID);
                     $oDatasetX = SubProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
                     $oDatasetX->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                     $oDatasetX->next();
@@ -4574,7 +4565,7 @@ class processMap
     {
         try {
             $oTask = new Task();
-            $oNewTask = new StdClass();
+            $oNewTask = new stdClass();
             $oNewTask->label = G::LoadTranslation('ID_SUBPROCESS');
             $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' ));
             //$oJSON = new Services_JSON();
@@ -4653,18 +4644,13 @@ class processMap
             //print'<hr>';print_r($_DBArray['NewCase']);print'<hr>';
             $oCriteria = new Criteria('workflow');
             $del = DBAdapter::getStringDelimiter();
+            $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
+            $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
+            $oCriteria->addSelectColumn(SubProcessPeer::SP_VARIABLES_OUT);
             $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID);
             $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID);
             $oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID);
-
-            $oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE');
-            $oCriteria->addAlias("C1", 'CONTENT');
-            $tasTitleConds = array();
-            $tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
-            $tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
-            $tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del );
-            $oCriteria->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
-
+            $oCriteria->addJoin(SubProcessPeer::TAS_PARENT, TaskPeer::TAS_UID);
             $oDataset = SubProcessPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
@@ -4673,8 +4659,7 @@ class processMap
             $aRow['TASKS'] = $aRow['TAS_UID'];
             //print "<hr>".$aRow['TASKS']."<hr>";
             //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
-            $aRow['TAS_TITLE'] = $aRow['CON_VALUE'];
-            $aRow['SPROCESS_NAME'] = $aRow['CON_VALUE'];
+            $aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
             $SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']);
             if (is_array($SP_VARIABLES_OUT)) {
                 $i = 1;
@@ -6037,17 +6022,13 @@ class processMap
             }
             //print'<hr>';print_r($_DBArray['NewCase']);print'<hr>';
             $oCriteria = new Criteria('workflow');
-            $del = DBAdapter::getStringDelimiter();
+            $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
+            $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
+            $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
             $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID);
             $oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID);
-
-            $oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE');
-            $oCriteria->addAlias("C1", 'CONTENT');
-            $tasTitleConds = array();
-            $tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID');
-            $tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-            $tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del);
-            $oCriteria->addJoinMC($tasTitleConds, Criteria::LEFT_JOIN);
+            $oCriteria->addJoin(SubProcessPeer::TAS_PARENT, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
+            $oCriteria->addJoin(SubProcessPeer::PRO_PARENT, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
 
             $oDataset = SubProcessPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -6065,11 +6046,7 @@ class processMap
             $aRow['TASKS'] = $aRow['TAS_UID'];
             //print "<hr>".$aRow['TASKS']."<hr>";
             //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
-            $aRow['TAS_TITLE'] = $aRow['CON_VALUE'];
-            $aRow['SPROCESS_NAME'] = $aRow['CON_VALUE'];
-            $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-            $aRow['PRO_TITLE'] = Content::load('PRO_TITLE', '', $aRow['PRO_UID'], $lang);
-
+            $aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
             if ($sType == 0) {
                 $SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']);
                 if (is_array($SP_VARIABLES_OUT)) {
@@ -7037,8 +7014,12 @@ class processMap
         $aFields['OP_ACTION'] = $aRows['OP_ACTION'];
 
         $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-        $aFields['TASK_TARGET_NAME'] = Content::load('TAS_TITLE', '', $aRows['TAS_UID'], $lang);
-        $aFields['TASK_SOURCE_NAME'] = Content::load('TAS_TITLE', '', $aRows['OP_TASK_SOURCE'], $lang);
+        $oTask = new Task();
+        $aTask = $oTask->load($aRows['TAS_UID']);
+        $aFields['TASK_TARGET_NAME'] = $aTask['TAS_TITLE'];
+        $oTask = new Task();
+        $aTask = $oTask->load($aRows['OP_TASK_SOURCE']);
+        $aFields['TASK_SOURCE_NAME'] = $aTask['TAS_TITLE'];
         $oUser = UsersPeer::retrieveByPK($aRows['USR_UID']);
         if (!is_null($oUser)) {
             $aFields['USR_FULLNAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
diff --git a/workflow/engine/classes/class.report.php b/workflow/engine/classes/class.report.php
index 0800a9825..4f06e5ba9 100755
--- a/workflow/engine/classes/class.report.php
+++ b/workflow/engine/classes/class.report.php
@@ -53,24 +53,15 @@ class Report
         require_once 'classes/model/AppDelegation.php';
         require_once 'classes/model/Application.php';
         $oCriteria = new Criteria( 'workflow' );
-        $del = DBAdapter::getStringDelimiter();
         $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
         $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
-        $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' );
-        $oCriteria->addAlias( "C1", 'CONTENT' );
-        $proTitleConds = array ();
-        $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
-        );
-        $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
-        );
-        $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
-        );
-        $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
+        $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
-        $oCriteria->addGroupByColumn( 'C1.CON_VALUE' );
+        $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE);
 
         $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
@@ -119,20 +110,12 @@ class Report
         $del = DBAdapter::getStringDelimiter();
         $oCriteria->addSelectColumn( UsersPeer::USR_UID );
         $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
         $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" );
-        $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' );
-        $oCriteria->addAlias( "C1", 'CONTENT' );
-        $proTitleConds = array ();
-        $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
-        );
-        $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
-        );
-        $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
-        );
-        $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
+        $oCriteria->addJoin (AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $oCriteria->addJoin( AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
         //$oCriteria->add(AppDelegationPeer::DEL_DURATION,  $from, Criteria::GREATER_EQUAL);
         //$oCriteria->add(AppDelegationPeer::DEL_DURATION,  $to, Criteria::LESS_EQUAL);
@@ -144,7 +127,7 @@ class Report
         }
 
         $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
-        $oCriteria->addGroupByColumn( 'C1.CON_VALUE' );
+        $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE);
 
         $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
@@ -245,18 +228,10 @@ class Report
         $oCriteria = new Criteria( 'workflow' );
         $del = DBAdapter::getStringDelimiter();
         $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
         $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
-        $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' );
-        $oCriteria->addAlias( "C1", 'CONTENT' );
-        $proTitleConds = array ();
-        $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
-        );
-        $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
-        );
-        $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
-        );
-        $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
+        $oCriteria->addJoin (AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
 
         $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
@@ -389,20 +364,12 @@ class Report
         $oCriteria = new Criteria( 'workflow' );
         $del = DBAdapter::getStringDelimiter();
         $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
         $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" );
         $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" );
-        $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' );
-        $oCriteria->addAlias( "C1", 'CONTENT' );
-        $proTitleConds = array ();
-        $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID'
-        );
-        $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del
-        );
-        $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del
-        );
-        $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN );
+        $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
-        $oCriteria->addGroupByColumn( 'C1.CON_VALUE' );
+        $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE);
 
         $oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );
 
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 77e06a99e..dc915c550 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -2766,18 +2766,10 @@ class wsBase
         $result = array ();
         try {
             $oCriteria = new Criteria( 'workflow' );
-            $del       = DBAdapter::getStringDelimiter();
             $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
             $oCriteria->addSelectColumn( AppDelegationPeer::TAS_UID );
-
-            $oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
-            $oCriteria->addAlias( "C1", 'CONTENT' );
-            $tasTitleConds   = array ();
-            $tasTitleConds[] = array (AppDelegationPeer::TAS_UID,'C1.CON_ID');
-            $tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del);
-            $tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del);
-            $oCriteria->addJoinMC( $tasTitleConds, Criteria::LEFT_JOIN );
-
+            $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
+            $oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID);
             $oCriteria->add( AppDelegationPeer::APP_UID, $caseId );
             $oCriteria->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
             $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php
index 723c2ce77..b573939da 100755
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -1055,15 +1055,14 @@ class AdditionalTables extends BaseAdditionalTables
             //now get the labels for all process, using an array of Uids,
             $c = new Criteria('workflow');
             //$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-            $c->add(ContentPeer::CON_LANG, defined('SYS_LANG') ? SYS_LANG : 'en', Criteria::EQUAL);
-            $c->add(ContentPeer::CON_ID, $proUids, Criteria::IN);
-
-            $dt = ContentPeer::doSelectRS($c);
+            $c->add(ProcessPeer::PRO_UID, $proUids, Criteria::IN);
+            $dt = ProcessPeer::doSelectRS($c);
             $dt->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
             while ($dt->next()) {
                 $row = $dt->getRow();
-                $procDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
+                $procDetails[$row['PRO_UID']]['PRO_TITLE'] = $row['PRO_TITLE'];
+                $procDetails[$row['PRO_UID']]['PRO_DESCRIPTION'] = $row['PRO_DESCRIPTION'];
             }
 
             foreach ($addTables as $i => $addTable) {
diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php
index 8e0d1f4d1..a88113fae 100755
--- a/workflow/engine/classes/model/AppEvent.php
+++ b/workflow/engine/classes/model/AppEvent.php
@@ -126,13 +126,10 @@ class AppEvent extends BaseAppEvent
             $oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS );
             $oCriteria->addSelectColumn( EventPeer::EVN_ACTION );
             $oCriteria->addSelectColumn( ApplicationPeer::APP_TITLE );
+            $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
+            $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
             $oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' );
-            $oCriteria->addAsColumn( 'TAS_TITLE', 'C2.CON_VALUE' );
-            $oCriteria->addAsColumn( 'PRO_TITLE', 'C4.CON_VALUE' );
             $oCriteria->addAlias( 'C1', 'CONTENT' );
-            $oCriteria->addAlias( 'C2', 'CONTENT' );
-            $oCriteria->addAlias( 'C3', 'CONTENT' );
-            $oCriteria->addAlias( 'C4', 'CONTENT' );
             $oCriteria->addJoin( AppEventPeer::EVN_UID, EventPeer::EVN_UID, Criteria::LEFT_JOIN );
             $del = DBAdapter::getStringDelimiter();
             $aConditions = array ();
@@ -149,24 +146,9 @@ class AppEvent extends BaseAppEvent
             $aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX
             );
             $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
-            $aConditions = array ();
-            $aConditions[] = array (AppDelegationPeer::TAS_UID,'C2.CON_ID'
-            );
-            $aConditions[] = array ('C2.CON_CATEGORY',$del . 'TAS_TITLE' . $del
-            );
-            $aConditions[] = array ('C2.CON_LANG',$del . SYS_LANG . $del
-            );
-            $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+            $oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
             $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
-            $aConditions = array ();
-            $aConditions[] = array (AppDelegationPeer::PRO_UID,'C4.CON_ID'
-            );
-            $aConditions[] = array ('C4.CON_CATEGORY',$del . 'PRO_TITLE' . $del
-            );
-            $aConditions[] = array ('C4.CON_LANG',$del . SYS_LANG . $del
-            );
-
-            $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+            $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
             $oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL );
             if ($sProcessUid != '') {
                 $oCriteria->add( EventPeer::PRO_UID, $sProcessUid );
@@ -298,7 +280,7 @@ class AppEvent extends BaseAppEvent
                 $oPMScript = new PMScript();
 
                 $task = new Task();
-                $taskFields = $task->Load( $aRow['TAS_UID'] );
+                $taskFields = $task->load( $aRow['TAS_UID'] );
                 $aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER'];
                 $aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE'];
                 $aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE'];
diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php
index 9ecdd0712..a581c1c1c 100644
--- a/workflow/engine/classes/model/ListCanceled.php
+++ b/workflow/engine/classes/model/ListCanceled.php
@@ -34,15 +34,13 @@ class ListCanceled extends BaseListCanceled {
         $data['APP_TITLE'] = $aRow['APP_TITLE'];
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
+        $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(AppDelegationPeer::TAS_UID);
@@ -52,7 +50,7 @@ class ListCanceled extends BaseListCanceled {
         $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
         $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
         $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
@@ -66,22 +64,20 @@ class ListCanceled extends BaseListCanceled {
         $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
         $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
         $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
         $data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID'];
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+        $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
+        $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index 39f353a84..062d4a463 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -45,27 +45,23 @@ class ListCompleted extends BaseListCompleted
 
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
         $dataset = ContentPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
 
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
+        $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+        $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
         $dataset = ContentPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
 
 
         $criteria = new Criteria();
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index 02b265dc9..50f8eeace 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -256,15 +256,14 @@ class ListInbox extends BaseListInbox
 
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_DEF_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+        $criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE);
+        $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
+        $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        if ($aRow['CON_VALUE'] == '') { 
+        if ($aRow['TAS_DEF_TITLE'] == '') {
             $criteria = new Criteria();
             $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
             $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
@@ -272,38 +271,23 @@ class ListInbox extends BaseListInbox
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dataset->next();
             $aRowApp = $dataset->getRow();
-            $aRow['CON_VALUE'] = $aRowApp['APP_TITLE'];
+            $aRow['TAS_DEF_TITLE'] = $aRowApp['APP_TITLE'];
         }
-        $data['APP_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TITLE'] = $aRow['TAS_DEF_TITLE'];
+        $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
 
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
+        $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
-
-
-        $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
-        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $dataset->next();
-        $aRow = $dataset->getRow();
-        $data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
-
+        $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
 
         $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]);
 
-
         $data['APP_PREVIOUS_USER'] = '';
         if ($data['DEL_PREVIOUS_USR_UID'] != '') {
             $criteria = new Criteria();
diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php
index 60be556db..d259d48e1 100644
--- a/workflow/engine/classes/model/ListPaused.php
+++ b/workflow/engine/classes/model/ListPaused.php
@@ -34,15 +34,13 @@ class ListPaused extends BaseListPaused {
         $data['APP_TITLE'] = $aRow['APP_TITLE'];
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
+        $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
@@ -53,7 +51,7 @@ class ListPaused extends BaseListPaused {
         $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
         $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
         $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
@@ -68,7 +66,7 @@ class ListPaused extends BaseListPaused {
         $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
         $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
         $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $dataset = AppDelegationPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
@@ -88,15 +86,13 @@ class ListPaused extends BaseListPaused {
         $data['DEL_PREVIOUS_USR_LASTNAME']  = $aRow['USR_LASTNAME'];
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+        $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
+        $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
 
         $criteria = new Criteria();
         $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php
index f143e38b8..26aadf3bc 100644
--- a/workflow/engine/classes/model/ListUnassigned.php
+++ b/workflow/engine/classes/model/ListUnassigned.php
@@ -111,27 +111,23 @@ class ListUnassigned extends BaseListUnassigned
         $data = array_merge($data, $aRow);
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL );
+        $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE'];
 
 
         $criteria = new Criteria();
-        $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-        $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL );
-        $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
+        $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
+        $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
-        $data['APP_TAS_TITLE'] = $aRow['CON_VALUE'];
+        $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE'];
 
 
         $data['APP_PREVIOUS_USER'] = '';
diff --git a/workflow/engine/classes/model/Step.php b/workflow/engine/classes/model/Step.php
index 57f1bbd09..6a4834266 100755
--- a/workflow/engine/classes/model/Step.php
+++ b/workflow/engine/classes/model/Step.php
@@ -418,14 +418,12 @@ class Step extends BaseStep
         $res = array();
         $oCriteria = new Criteria();
         $oCriteria->addSelectColumn( StepPeer::TAS_UID );
-        $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
         $oCriteria->addSelectColumn( StepPeer::STEP_POSITION );
+        $oCriteria->addAsColumn('CON_VALUE', TaskPeer::TAS_TITLE);
         $oCriteria->add( StepPeer::PRO_UID, $proUid );
         $oCriteria->add( StepPeer::STEP_UID_OBJ, $dynUid );
         $oCriteria->add( StepPeer::STEP_TYPE_OBJ, 'DYNAFORM' );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE');
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG);
-        $oCriteria->addJoin( StepPeer::TAS_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN);
+        $oCriteria->addJoin( StepPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::INNER_JOIN);
         $oDataset = StepPeer::doSelectRS( $oCriteria );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
         while($oDataset->next()) {
diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php
index dae89ea0e..59734e78e 100644
--- a/workflow/engine/controllers/appProxy.php
+++ b/workflow/engine/controllers/appProxy.php
@@ -98,9 +98,10 @@ class AppProxy extends HttpProxyController
         $appNotes = new AppNotes();
         $response = $appNotes->getNotesList( $appUid, '', $httpData->start, $httpData->limit );
 
-        require_once ("classes/model/Content.php");
-        $content = new Content();
-        $response['array']['appTitle'] = $content->load('APP_TITLE', '', $appUid, SYS_LANG);
+        require_once ("classes/model/Application.php");
+        $oApplication = new Application();
+        $aApplication = $oApplication->Load($appUid);
+        $response['array']['appTitle'] = $aApplication['APP_TITLE'];
 
         return $response['array'];
     }
@@ -292,7 +293,9 @@ class AppProxy extends HttpProxyController
 
         // note added by krlos pacha carlos[at]colosa[dot]com
         //getting this field if it doesn't exist. Related 7994 bug
-        $taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : Content::Load( "TAS_TITLE", "", $applicationFields['TAS_UID'], SYS_LANG );
+        $oTask = new \Task();
+        $aTasks = $oTask->load($applicationFields['TAS_UID']);
+        $taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : $aTasks["TAS_TITLE"];
         $data[] = array ("label" => $labelsCurrentTaskProperties["TAS_TITLE"], "value" => htmlentities($taskData["TAS_TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labelTitleCurrentTasks["TITLE2"]);
         $data[] = array ('label' => $labelsCurrentTaskProperties['CURRENT_USER'],'value' => $currentUser,'section' => $labelTitleCurrentTasks['TITLE2']);
         $data[] = array ('label' => $labelsCurrentTaskProperties['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']);
diff --git a/workflow/engine/methods/cases/casesDemo.php b/workflow/engine/methods/cases/casesDemo.php
index 4d9a9f98c..589b94255 100755
--- a/workflow/engine/methods/cases/casesDemo.php
+++ b/workflow/engine/methods/cases/casesDemo.php
@@ -79,7 +79,9 @@ try {
     $Fields['APP_PIN'] = $appFields['APP_PIN'];
     $Fields['APP_PROC_CODE'] = $appFields['APP_PROC_CODE'];
 
-    $Fields['PRO_TITLE'] = Content::load( 'PRO_TITLE', '', $appFields['PRO_UID'], SYS_LANG );
+    $objProc = new Process();
+    $aProc = $objProc->load($appFields['PRO_UID']);
+    $Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
     $oUser = new Users();
     $oUser->load( $appFields['APP_CUR_USER'] );
     $Fields['CUR_USER'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
@@ -91,7 +93,9 @@ try {
     $Fields['CANT_APP_DATA'] = count( $Fields['APP_DATA'] );
     $delegations = $oCase->GetAllDelegations( $appFields['APP_UID'] );
     foreach ($delegations as $key => $val) {
-        $delegations[$key]['TAS_TITLE'] = Content::load( 'TAS_TITLE', '', $val['TAS_UID'], SYS_LANG );
+        $objTask = new Task();
+        $aTask = $objTask->load($val['TAS_UID']);
+        $delegations[$key]['TAS_TITLE'] = $aTask['TAS_TITLE'];
         if ($val['USR_UID'] != - 1) {
             $oUser->load( $val['USR_UID'] );
             $delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php
index 4095ee3ce..f14364444 100755
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -172,10 +172,8 @@ function lookinginforContentProcess ($sproUid)
     $oContent = new Content();
     ///we are looking for a pro title for this process $sproUid
     $oCriteria = new Criteria( 'workflow' );
-    $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-    $oCriteria->add( ContentPeer::CON_LANG, 'en' );
-    $oCriteria->add( ContentPeer::CON_ID, $sproUid );
-    $oDataset = ContentPeer::doSelectRS( $oCriteria );
+    $oCriteria->add( ProcessPeer::PRO_UID, $sproUid );
+    $oDataset = ProcessPeer::doSelectRS( $oCriteria );
     $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
     $oDataset->next();
     $aRow = $oDataset->getRow();
diff --git a/workflow/engine/methods/mails/emailsAjax.php b/workflow/engine/methods/mails/emailsAjax.php
index 45bc34cc5..4c26f1159 100644
--- a/workflow/engine/methods/mails/emailsAjax.php
+++ b/workflow/engine/methods/mails/emailsAjax.php
@@ -83,9 +83,7 @@ switch($req){
 
         $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
         $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
-
-        $criteria->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
-        $criteria->addAlias('C2', 'CONTENT');
+        $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
 
         if ($emailStatus != '') {
             $criteria->add( AppMessagePeer::APP_MSG_STATUS, $emailStatus);
@@ -129,16 +127,7 @@ switch($req){
             $criteria->setOffset($start);
         }
         $criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID);
-
-        $conditions = array();
-        $conditions[] = array(ApplicationPeer::PRO_UID, 'C2.CON_ID');
-        $conditions[] = array(
-            'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
-        );
-        $conditions[] = array(
-            'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
-        );
-        $criteria->addJoinMC($conditions, Criteria::LEFT_JOIN);
+        $criteria->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID);
         $result = AppMessagePeer::doSelectRS($criteria);
         $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $data = Array();
diff --git a/workflow/engine/methods/processes/processes_Save.php b/workflow/engine/methods/processes/processes_Save.php
index cca4e590e..13d90973c 100755
--- a/workflow/engine/methods/processes/processes_Save.php
+++ b/workflow/engine/methods/processes/processes_Save.php
@@ -40,9 +40,7 @@ switch ($function) {
         $snameProcess = urldecode( $_POST['NAMEPROCESS'] );
         $oCriteria = new Criteria( 'workflow' );
         $oCriteria->addSelectColumn( 'COUNT(*) AS PROCESS' );
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-        $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
-        $oCriteria->add( ContentPeer::CON_VALUE, $snameProcess );
+        $oCriteria->add(ProcessPeer::PRO_TITLE, $snameProcess);
         $oDataset = ContentPeer::doSelectRS( $oCriteria );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
         $oDataset->next();
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index b697993b7..d517b980a 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -210,17 +210,15 @@ try {
             $objectPermision = $doSelectRS->getRow();
             if (isset($objectPermision["USR_UID"])) {
                 $criteria = new Criteria("workflow");
-                $criteria->addSelectColumn(ContentPeer::CON_VALUE);
-                $criteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL);
-                $criteria->add(ContentPeer::CON_ID, $objectPermision["PRO_UID"], Criteria::EQUAL);
-                $criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL);
-                $doSelectRS = ContentPeer::doSelectRS($criteria);
+                $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+                $criteria->add(ProcessPeer::PRO_UID, $objectPermision["PRO_UID"], Criteria::EQUAL);
+                $doSelectRS = ProcessPeer::doSelectRS($criteria);
                 $doSelectRS->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                 $doSelectRS->next();
                 $content = $doSelectRS->getRow();
                 echo G::json_encode(array(
                     "status" => 'ERROR',
-                    "message" => G::LoadTranslation('ID_USER_CANT_BE_DELETED_FOR_THE_PROCESS', array('processTitle' => isset($content["CON_VALUE"]) ? $content["CON_VALUE"] : $objectPermision['PRO_UID']))
+                    "message" => G::LoadTranslation('ID_USER_CANT_BE_DELETED_FOR_THE_PROCESS', array('processTitle' => isset($content["PRO_TITLE"]) ? $content["PRO_TITLE"] : $objectPermision['PRO_UID']))
                 ));
                 break;
             }
diff --git a/workflow/engine/methods/users/users_ReassignCases.php b/workflow/engine/methods/users/users_ReassignCases.php
index 0491387ae..fa14c2a0a 100755
--- a/workflow/engine/methods/users/users_ReassignCases.php
+++ b/workflow/engine/methods/users/users_ReassignCases.php
@@ -73,16 +73,9 @@ try {
                     require_once 'classes/model/AppDelegation.php';
                     $oCriteria = new Criteria( 'workflow' );
                     $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+                    $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
                     $oCriteria->addSelectColumn( 'COUNT(' . AppDelegationPeer::PRO_UID . ') AS CANTITY' );
-                    $oCriteria->addAsColumn( 'PRO_TITLE', ContentPeer::CON_VALUE );
-                    $aConditions = array ();
-                    $aConditions[] = array (AppDelegationPeer::PRO_UID,ContentPeer::CON_ID
-                    );
-                    $aConditions[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del
-                    );
-                    $aConditions[] = array (ContentPeer::CON_LANG,$del . SYS_LANG . $del
-                    );
-                    $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+                    $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID);
                     $oCriteria->add( AppDelegationPeer::USR_UID, $_POST['USR_UID'] );
                     $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
                     $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 418a09032..4b7b2d56b 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -710,13 +710,8 @@ class Cases
             $oCriteria->addSelectColumn( \AppDelegationPeer::TAS_UID );
             $oCriteria->addSelectColumn(\AppDelegationPeer::DEL_INIT_DATE);
             $oCriteria->addSelectColumn(\AppDelegationPeer::DEL_TASK_DUE_DATE);
-            $oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
-            $oCriteria->addAlias( "C1", 'CONTENT' );
-            $tasTitleConds   = array ();
-            $tasTitleConds[] = array (\AppDelegationPeer::TAS_UID,'C1.CON_ID');
-            $tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del);
-            $tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del);
-            $oCriteria->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
+            $oCriteria->addSelectColumn(\TaskPeer::TAS_TITLE);
+            $oCriteria->addJoin(\AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID);
             $oCriteria->add( \AppDelegationPeer::APP_UID, $applicationUid );
             $oCriteria->add( \AppDelegationPeer::USR_UID, $userUid );
             $oCriteria->add( \AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index ce0eb08e3..802a21a72 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -176,7 +176,6 @@ class Light
     public function getTransferHistoryCriteria($sAppUid)
     {
         $c = new Criteria('workflow');
-        $c->addAsColumn('TAS_TITLE', 'TAS_TITLE.CON_VALUE');
         $c->addSelectColumn(UsersPeer::USR_FIRSTNAME);
         $c->addSelectColumn(UsersPeer::USR_LASTNAME);
         $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -200,6 +199,7 @@ class Light
         $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
         $c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE);
         $c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE);
+        $c->addSelectColumn(\TaskPeer::TAS_TITLE);
         //APP_DELEGATION LEFT JOIN USERS
         $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
 
@@ -212,14 +212,8 @@ class Light
         $app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID);
         $c->addJoinMC($app, Criteria::LEFT_JOIN);
 
-        //LEFT JOIN CONTENT TAS_TITLE
-        $c->addAlias("TAS_TITLE", 'CONTENT');
-        $del = \DBAdapter::getStringDelimiter();
-        $appTitleConds = array();
-        $appTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
-        $appTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
-        $appTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
-        $c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
+        //LEFT JOIN TASK TAS_TITLE
+        $c->addJoin(AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
 
         //WHERE
         $c->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -320,11 +314,9 @@ class Light
         $oContent = new \Content();
         ///we are looking for a pro title for this process $sproUid
         $oCriteria = new \Criteria( 'workflow' );
-        $oCriteria->add( \ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
-        $oCriteria->add( \ContentPeer::CON_LANG, 'en' );
-        $oCriteria->add( \ContentPeer::CON_ID, $sproUid );
-        $oDataset = \ContentPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
+        $oCriteria->add(\ProcessPeer::PRO_UID, $sproUid);
+        $oDataset = \ProcessPeer::doSelectRS( $oCriteria );
+        $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aRow = $oDataset->getRow();
         if (!is_array($aRow)) {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php b/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php
index 46c40c785..73323c004 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php
@@ -21,15 +21,7 @@ class Subprocess
             $del = \DBAdapter::getStringDelimiter();
             $oCriteria->add(SubProcessPeer::PRO_PARENT, $pro_uid);
             $oCriteria->add(SubProcessPeer::TAS_PARENT, $tas_uid);
-
-            $oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE');
-            $oCriteria->addAlias("C1", 'CONTENT');
-            $tasTitleConds = array();
-            $tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
-            $tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
-            $tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del );
-            $oCriteria->addJoinMC($tasTitleConds, \Criteria::LEFT_JOIN);
-
+            $oCriteria->addJoin(SubProcessPeer::TAS_PARENT, \TaskPeer::TAS_UID);
             $oDataset = SubProcessPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
@@ -41,7 +33,7 @@ class Subprocess
             $response['spr_tas_parent'] = $aRow['tas_parent'];
             $response['spr_pro'] = $aRow['pro_uid'];
             $response['spr_tas'] = $aRow['tas_uid'];
-            $response['spr_name'] = $aRow['con_value'];
+            $response['spr_name'] = $aRow['tas_title'];
             $response['spr_synchronous'] = $aRow['sp_synchronous'];
             $response['spr_variables_out'] = unserialize($aRow['sp_variables_out']);
             if ((int)$response['spr_synchronous'] === 1) {

From 70eb897ce1bbf2b95f70f7f6c76fa9698db426a7 Mon Sep 17 00:00:00 2001
From: qronald <ronald.quenta@processmaker.com>
Date: Mon, 18 Jul 2016 14:22:55 -0400
Subject: [PATCH 14/16] fix in name table}

---
 workflow/engine/classes/model/ListCompleted.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index 062d4a463..4cf8c2afc 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -47,7 +47,7 @@ class ListCompleted extends BaseListCompleted
         $criteria = new Criteria();
         $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
         $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL);
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $dataset = ProcessPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();
@@ -57,7 +57,7 @@ class ListCompleted extends BaseListCompleted
         $criteria = new Criteria();
         $criteria->addSelectColumn(TaskPeer::TAS_TITLE);
         $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL);
-        $dataset = ContentPeer::doSelectRS($criteria);
+        $dataset = TaskPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
         $aRow = $dataset->getRow();

From 60f9a8e0942491edf8aa4e8e2ebf23e390bd38eb Mon Sep 17 00:00:00 2001
From: qronald <ronald.quenta@processmaker.com>
Date: Thu, 7 Jul 2016 14:25:04 -0400
Subject: [PATCH 15/16] HOR-1330 Modificar el upgrade para colocar los valores
 de las nuevas columnas copiadas de CONTENT

up observations

remove method migrate_content in database-upgrade

fix in Application and InputDocument
---
 workflow/engine/bin/tasks/cliWorkspaces.php   | 69 +++++++++++++++++++
 workflow/engine/classes/class.wsTools.php     | 47 ++++++++++++-
 workflow/engine/classes/model/Application.php | 14 ++--
 .../engine/classes/model/InputDocument.php    | 28 +++++---
 4 files changed, 139 insertions(+), 19 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index 090860e6e..00c03db36 100755
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -257,6 +257,19 @@ CLI::taskArg('workspace', true, true);
 CLI::taskRun("run_migrate_new_cases_lists");
 /*----------------------------------********---------------------------------*/
 
+CLI::taskName('migrate-content');
+CLI::taskDescription(<<<EOT
+  Migrating the content schema to match the latest version
+
+  Specify the WORKSPACE to migrate from a existing workspace.
+
+  If no workspace is specified, then the tables schema will be upgraded or
+  migrate on all available workspaces.
+EOT
+);
+CLI::taskArg('workspace', true, true);
+CLI::taskRun("run_migrate_content");
+
   /**
    * Function run_info
    * access public
@@ -811,3 +824,59 @@ function migrate_counters($command, $args) {
 }
 /*----------------------------------********---------------------------------*/
 
+function run_migrate_content($args) {
+    G::LoadSystem('inputfilter');
+    $filter = new InputFilter();
+    $args = $filter->xssFilterHard($args);
+    $workspaces = get_workspaces_from_args($args);
+    foreach ($workspaces as $workspace) {
+        if (!defined('SYS_SYS')) {
+            define('SYS_SYS', $workspace->name);
+        }
+        print_r('Regenerating content in: ' . pakeColor::colorize($workspace->name, 'INFO') . "\n");
+        migrate_content($workspace);
+    }
+}
+
+function migrate_content($workspace) {
+    if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
+        define('MEMCACHED_ENABLED', false);
+    }
+    $content = array(
+        'Groupwf' => array(
+            'uid' => 'GRP_UID',
+            'fields' => array('GRP_TITLE'),
+            'methods' => array('exists' => 'GroupwfExists')
+        ),
+        'Process' => array(
+            'uid' => 'PRO_UID',
+            'fields' => array('PRO_TITLE', 'PRO_DESCRIPTION'),
+            'methods' => array('exists' => 'exists')
+        ),
+        'Department' => array(
+            'uid' => 'DEP_UID',
+            'fields' => array('DEPO_TITLE'),
+            'alias' => array('DEPO_TITLE' => 'DEP_TITLE'),
+            'methods' => array('exists' => 'existsDepartment')
+        ),
+        'Task' => array(
+            'uid' => 'TAS_UID',
+            'fields' => array('TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION'),
+            'methods' => array('exists' => 'taskExists')
+        ),
+        'InputDocument' => array(
+            'uid' => 'INP_DOC_UID',
+            'fields' => array('INP_DOC_TITLE', 'INP_DOC_DESCRIPTION'),
+            'methods' => array('exists' => 'InputExists')
+        ),
+        'Application' => array(
+            'uid' => 'APP_UID',
+            'fields' => array('APP_TITLE', 'APP_DESCRIPTION'),
+            'methods' => array('exists' => 'exists')
+        )
+    );
+    CLI::logging("-> Regenerating content \n");
+    foreach ($content as $className => $fields) {
+        $workspace->migrateContent($className, $fields, $workspace->name);
+    }
+}
\ No newline at end of file
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 78f1153ae..54ae4942d 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -3099,5 +3099,50 @@ class workspaceTools
         }
         return $response;
     }
-
+    
+    /**
+     * Migrate this workspace table Content.
+     * 
+     * @param $className
+     * @param $fields
+     * @param $workSpace
+     * @param mixed|string $sys_lang
+     * @throws Exception
+     */
+    public function migrateContent($className, $fields, $workSpace, $sys_lang = SYS_LANG)
+    {
+        try {
+            $this->initPropel(true);
+            $_SESSION['sys_sys'] = $workSpace;
+            $fieldUidName = $fields['uid'];
+            $oCriteria = new Criteria();
+            $oCriteria->clearSelectColumns();
+            $oCriteria->addAsColumn($fieldUidName, ContentPeer::CON_ID);
+            $oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY);
+            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
+            $oCriteria->add(ContentPeer::CON_CATEGORY, $fields['fields'], Criteria::IN);
+            $oCriteria->add(ContentPeer::CON_LANG, $sys_lang);
+            $oDataset = ContentPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $methods = $fields['methods'];
+            while ($oDataset->next()) {
+                $row = $oDataset->getRow();
+                $fieldName = $row['CON_CATEGORY'];
+                $fieldName = isset($fields['alias']) && isset($fields['alias'][$fieldName]) ? $fields['alias'][$fieldName] : $fieldName;
+                unset($row['CON_CATEGORY']);
+                $fieldValue = $row['CON_VALUE'];
+                unset($row['CON_VALUE']);
+                $row[$fieldName] = $fieldValue;
+                $oTable = new $className();
+                $mExists = $methods['exists'];
+                if ($oTable->$mExists($row[$fieldUidName])){
+                    $oTable->update($row);
+                }
+            }
+            $classNamePeer = $className . 'Peer';
+            CLI::logging("|--> Add content in table " . $classNamePeer::TABLE_NAME . "\n");
+        } catch (Exception $e) {
+            throw ($e);
+        }
+    }
 }
diff --git a/workflow/engine/classes/model/Application.php b/workflow/engine/classes/model/Application.php
index 937cc48c6..cd3c53a43 100755
--- a/workflow/engine/classes/model/Application.php
+++ b/workflow/engine/classes/model/Application.php
@@ -62,7 +62,7 @@ class Application extends BaseApplication
         }
 
         if ($this->getAppUid() == '') {
-            throw (new Exception( "Error in getAppTitle, the APP_UID can't be blank"));
+            throw (new Exception( "Error in getAppTitleContent, the APP_UID can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
@@ -80,7 +80,7 @@ class Application extends BaseApplication
     public function setAppTitleContent($v)
     {
         if ($this->getAppUid() == '') {
-            throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank"));
+            throw (new Exception( "Error in setAppTitleContent, the APP_UID can't be blank"));
         }
 
         //Since the native PHP type for this column is string,
@@ -103,7 +103,7 @@ class Application extends BaseApplication
     public function getAppDescriptionContent()
     {
         if ($this->getAppUid() == '') {
-            throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank"));
+            throw (new Exception( "Error in getAppDescriptionContent, the APP_UID can't be blank"));
         }
 
         $lang = defined('SYS_LANG')? SYS_LANG : 'en';
@@ -121,7 +121,7 @@ class Application extends BaseApplication
     public function setAppDescriptionContent($v)
     {
         if ($this->getAppUid() == '') {
-            throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") );
+            throw ( new Exception( "Error in setAppDescriptionContent, the APP_UID can't be blank") );
         }
 
         // Since the native PHP type for this column is string,
@@ -295,10 +295,10 @@ class Application extends BaseApplication
 
                 if ($oApp->validate()) {
                     if (isset($aData['APP_TITLE'])) {
-                        $this->setAppTitleContent($aData['APP_TITLE']);
+                        $oApp->setAppTitleContent($aData['APP_TITLE']);
                     }
                     if (isset($aData['APP_DESCRIPTION'])) {
-                        $this->setAppDescriptionContent($aData['APP_DESCRIPTION']);
+                        $oApp->setAppDescriptionContent($aData['APP_DESCRIPTION']);
                     }
 
                     //if ( isset ( $aData['APP_PROC_CODE'] ) )
@@ -311,7 +311,7 @@ class Application extends BaseApplication
                 } else {
                     $msg = '';
 
-                    foreach ($this->getValidationFailures() as $objValidationFailure) {
+                    foreach ($oApp->getValidationFailures() as $objValidationFailure) {
                         $msg .= $objValidationFailure->getMessage() . "<br/>";
                     }
 
diff --git a/workflow/engine/classes/model/InputDocument.php b/workflow/engine/classes/model/InputDocument.php
index 2987077ed..1556a6ff7 100755
--- a/workflow/engine/classes/model/InputDocument.php
+++ b/workflow/engine/classes/model/InputDocument.php
@@ -197,23 +197,29 @@ class InputDocument extends BaseInputDocument
                     $iResult = $oInputDocument->save();
                     $oConnection->commit();
                     //Add Audit Log
-                    switch ($aData['INP_DOC_FORM_NEEDED']){
-                      case 'VIRTUAL':
-                        $docType = 'Digital';
-                        break;
-                      case 'REAL':
-                        $docType = 'Printed';
-                        break;
-                      case 'VREAL':
-                        $docType = 'Digital/Printed';
-                        break;
+                    $docType = '';
+                    if(!empty($aData['INP_DOC_FORM_NEEDED'])) {
+                        switch ($aData['INP_DOC_FORM_NEEDED']) {
+                            case 'VIRTUAL':
+                                $docType = 'Digital';
+                                break;
+                            case 'REAL':
+                                $docType = 'Printed';
+                                break;
+                            case 'VREAL':
+                                $docType = 'Digital/Printed';
+                                break;
+                        }
                     }
                     if(isset($aData['INP_DOC_VERSIONING']) && $aData['INP_DOC_VERSIONING'] == 1){
                       $enableVersion = 'Yes';
                     }else{
                       $enableVersion = 'No';
                     }
-                    $description = "Input Document Title: ".$aData['INP_DOC_TITLE'].", Input Document Uid: ".$aData['INP_DOC_UID'].", Document Type: ".$docType;
+                    $description = '';
+                    if (!empty( $aData['INP_DOC_TITLE'] )) {
+                        $description = "Input Document Title: ".$aData['INP_DOC_TITLE'].", Input Document Uid: ".$aData['INP_DOC_UID'].", Document Type: ".$docType;
+                    }
                     if(!empty($aData['INP_DOC_DESCRIPTION'])){
                       $description .= ", Description: ".$aData['INP_DOC_DESCRIPTION'];
                     }

From 595dd847c365ea83604a685f812b30c0583c16d4 Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.quenta@processmaker.com>
Date: Wed, 20 Jul 2016 11:48:10 -0400
Subject: [PATCH 16/16] add migrate-content in ugrade

---
 workflow/engine/bin/tasks/cliWorkspaces.php | 53 +++-----------
 workflow/engine/classes/class.wsTools.php   | 80 ++++++++++++++++++---
 2 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index 00c03db36..68b9d3c52 100755
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -824,59 +824,22 @@ function migrate_counters($command, $args) {
 }
 /*----------------------------------********---------------------------------*/
 
-function run_migrate_content($args) {
+function run_migrate_content($args, $opts) {
     G::LoadSystem('inputfilter');
     $filter = new InputFilter();
     $args = $filter->xssFilterHard($args);
     $workspaces = get_workspaces_from_args($args);
+    $lang = array_key_exists("lang", $opts) ? $opts['lang'] : SYS_LANG;
+    $start = microtime(true);
+    CLI::logging("> Optimizing content data...\n");
     foreach ($workspaces as $workspace) {
         if (!defined('SYS_SYS')) {
             define('SYS_SYS', $workspace->name);
         }
         print_r('Regenerating content in: ' . pakeColor::colorize($workspace->name, 'INFO') . "\n");
-        migrate_content($workspace);
+        CLI::logging("-> Regenerating content \n");
+        $workspace->migrateContentRun($workspace->name, $lang);
     }
+    $stop = microtime(true);
+    CLI::logging("<*>   Optimizing content data Process took " . ($stop - $start) . " seconds.\n");
 }
-
-function migrate_content($workspace) {
-    if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
-        define('MEMCACHED_ENABLED', false);
-    }
-    $content = array(
-        'Groupwf' => array(
-            'uid' => 'GRP_UID',
-            'fields' => array('GRP_TITLE'),
-            'methods' => array('exists' => 'GroupwfExists')
-        ),
-        'Process' => array(
-            'uid' => 'PRO_UID',
-            'fields' => array('PRO_TITLE', 'PRO_DESCRIPTION'),
-            'methods' => array('exists' => 'exists')
-        ),
-        'Department' => array(
-            'uid' => 'DEP_UID',
-            'fields' => array('DEPO_TITLE'),
-            'alias' => array('DEPO_TITLE' => 'DEP_TITLE'),
-            'methods' => array('exists' => 'existsDepartment')
-        ),
-        'Task' => array(
-            'uid' => 'TAS_UID',
-            'fields' => array('TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION'),
-            'methods' => array('exists' => 'taskExists')
-        ),
-        'InputDocument' => array(
-            'uid' => 'INP_DOC_UID',
-            'fields' => array('INP_DOC_TITLE', 'INP_DOC_DESCRIPTION'),
-            'methods' => array('exists' => 'InputExists')
-        ),
-        'Application' => array(
-            'uid' => 'APP_UID',
-            'fields' => array('APP_TITLE', 'APP_DESCRIPTION'),
-            'methods' => array('exists' => 'exists')
-        )
-    );
-    CLI::logging("-> Regenerating content \n");
-    foreach ($content as $className => $fields) {
-        $workspace->migrateContent($className, $fields, $workspace->name);
-    }
-}
\ No newline at end of file
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 54ae4942d..52902357c 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -121,6 +121,12 @@ class workspaceTools
         $this->processFilesUpgrade();
         $stop = microtime(true);
         CLI::logging("<*>   Updating Files Manager took " . ($stop - $start) . " seconds.\n");
+
+        $start = microtime(true);
+        CLI::logging("> Optimizing content data...\n");
+        $this->migrateContent($workSpace, $lang);
+        $stop = microtime(true);
+        CLI::logging("<*>   Optimizing content data took " . ($stop - $start) . " seconds.\n");
     }
 
     /**
@@ -3099,21 +3105,37 @@ class workspaceTools
         }
         return $response;
     }
-    
+
+    public function migrateContent($workspace, $lang = SYS_LANG) {
+        if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
+            define('MEMCACHED_ENABLED', false);
+        }
+        $this->initPropel(true);
+        $conf  = new Configuration();
+        if (!$conf->exists('MIGRATED_CONTENT', 'content')) {
+            $data["CFG_UID"]  ='MIGRATED_CONTENT';
+            $data["OBJ_UID"]  ='content';
+            $data["CFG_VALUE"]='true';
+            $data["PRO_UID"]  ='';
+            $data["USR_UID"]  ='';
+            $data["APP_UID"]  ='';
+            $this->migrateContentRun($workspace, $lang);
+            $conf->create($data);
+        }
+    }
+
     /**
      * Migrate this workspace table Content.
-     * 
+     *
      * @param $className
      * @param $fields
-     * @param $workSpace
-     * @param mixed|string $sys_lang
+     * @param mixed|string $lang
      * @throws Exception
      */
-    public function migrateContent($className, $fields, $workSpace, $sys_lang = SYS_LANG)
+    public function migrateContentWorkspace($className, $fields, $lang = SYS_LANG)
     {
         try {
             $this->initPropel(true);
-            $_SESSION['sys_sys'] = $workSpace;
             $fieldUidName = $fields['uid'];
             $oCriteria = new Criteria();
             $oCriteria->clearSelectColumns();
@@ -3121,7 +3143,7 @@ class workspaceTools
             $oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY);
             $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
             $oCriteria->add(ContentPeer::CON_CATEGORY, $fields['fields'], Criteria::IN);
-            $oCriteria->add(ContentPeer::CON_LANG, $sys_lang);
+            $oCriteria->add(ContentPeer::CON_LANG, $lang);
             $oDataset = ContentPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $methods = $fields['methods'];
@@ -3140,9 +3162,51 @@ class workspaceTools
                 }
             }
             $classNamePeer = $className . 'Peer';
-            CLI::logging("|--> Add content in table " . $classNamePeer::TABLE_NAME . "\n");
+            CLI::logging("|--> Add content data in table " . $classNamePeer::TABLE_NAME . "\n");
         } catch (Exception $e) {
             throw ($e);
         }
     }
+
+    public function migrateContentRun($workspace, $lang = SYS_LANG) {
+        if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
+            define('MEMCACHED_ENABLED', false);
+        }
+        $content = array(
+            'Groupwf' => array(
+                'uid' => 'GRP_UID',
+                'fields' => array('GRP_TITLE'),
+                'methods' => array('exists' => 'GroupwfExists')
+            ),
+            'Process' => array(
+                'uid' => 'PRO_UID',
+                'fields' => array('PRO_TITLE', 'PRO_DESCRIPTION'),
+                'methods' => array('exists' => 'exists')
+            ),
+            'Department' => array(
+                'uid' => 'DEP_UID',
+                'fields' => array('DEPO_TITLE'),
+                'alias' => array('DEPO_TITLE' => 'DEP_TITLE'),
+                'methods' => array('exists' => 'existsDepartment')
+            ),
+            'Task' => array(
+                'uid' => 'TAS_UID',
+                'fields' => array('TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION'),
+                'methods' => array('exists' => 'taskExists')
+            ),
+            'InputDocument' => array(
+                'uid' => 'INP_DOC_UID',
+                'fields' => array('INP_DOC_TITLE', 'INP_DOC_DESCRIPTION'),
+                'methods' => array('exists' => 'InputExists')
+            ),
+            'Application' => array(
+                'uid' => 'APP_UID',
+                'fields' => array('APP_TITLE', 'APP_DESCRIPTION'),
+                'methods' => array('exists' => 'exists')
+            )
+        );
+        foreach ($content as $className => $fields) {
+            $this->migrateContentWorkspace($className, $fields, $lang);
+        }
+    }
 }