Automatic merge with the upstream master branch

This commit is contained in:
Gustavo Cruz
2012-11-29 12:18:58 -04:00
144 changed files with 6902 additions and 2234 deletions

View File

@@ -35,13 +35,13 @@ class Applications
G::LoadClass("BasePeer");
G::LoadClass("configuration");
require_once ("classes/model/AppCacheView.php");
require_once ("classes/model/AppDelegation.php");
require_once ("classes/model/AdditionalTables.php");
require_once ("classes/model/AppDelay.php");
require_once ("classes/model/Fields.php");
require_once ("classes/model/Users.php");
require_once ("classes/model/Process.php");
//require_once ("classes/model/AppCacheView.php");
//require_once ("classes/model/AppDelegation.php");
//require_once ("classes/model/AdditionalTables.php");
//require_once ("classes/model/AppDelay.php");
//require_once ("classes/model/Fields.php");
//require_once ("classes/model/Users.php");
//require_once ("classes/model/Process.php");
$oAppCache = new AppCacheView();
@@ -693,14 +693,14 @@ class Applications
public function getSteps ($appUid, $index, $tasUid, $proUid)
{
require_once 'classes/model/Step.php';
require_once 'classes/model/Content.php';
require_once 'classes/model/AppDocument.php';
require_once 'classes/model/InputDocumentPeer.php';
require_once 'classes/model/OutputDocument.php';
require_once 'classes/model/Dynaform.php';
//require_once 'classes/model/Step.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/AppDocument.php';
//require_once 'classes/model/InputDocumentPeer.php';
//require_once 'classes/model/OutputDocument.php';
//require_once 'classes/model/Dynaform.php';
G::LoadClass( 'pmScript' );
//G::LoadClass( 'pmScript' );
G::LoadClass( 'case' );
$steps = Array ();