Merge branch 'master' of bitbucket.org:colosa/processmaker

2013-12-06 16:52:48 -04:00
parent 5f61f799e7 682212e799
commit 7db575fa62
1 changed files with 6 additions and 0 deletions
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php
@@ -169,6 +169,9 @@ class ActivityPropertiesStructure
     */
    public $tas_group_variable;

+    /**
+     * @var string {@from body}
+     */
    public $tas_selfservice_time;

    /**
@@ -201,6 +204,9 @@ class ActivityPropertiesStructure
     */
    public $tas_timeunit;

+    /**
+     * @var string {@from body} {@choice 1,,2}
+     */
    public $tas_type_day;

    /**