Merged colosa/processmaker into master

2015-05-22 11:55:41 -04:00
parent f9f2baecc5 31cf89ca70
commit f521e880cc
14 changed files with 93 additions and 41 deletions
--- a/workflow/engine/methods/setup/auditLog.php
+++ b/workflow/engine/methods/setup/auditLog.php
@@ -150,7 +150,9 @@ $arrayAction = array(
    "AssignUserTask"             => G::LoadTranslation("ID_ASSIGN_USER_TASK"),
    "AssignGroupTask"            => G::LoadTranslation("ID_ASSIGN_GROUP_TASK"),
    "DeleteUserTask"             => G::LoadTranslation("ID_DELETE_USER_TASK"),
-    "DeleteGroupTask"            => G::LoadTranslation("ID_DELETE_GROUP_TASK")
+    "DeleteGroupTask"            => G::LoadTranslation("ID_DELETE_GROUP_TASK"),
+    "ImportProcess"              => G::LoadTranslation("ID_IMPORT_PROCESS"),
+    "DeleteProcess"              => G::LoadTranslation("ID_DELETE_PROCESS")
 );

 asort($arrayAction);