fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.5.5 (pull request #7536)

Browse Source 
Updating develop with last changes in 3.5.5

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2020-10-23 13:48:22 +00:00
parent 05c99db5c1 936ce91a50
commit 8fd35ed72a
4 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

12
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -51939,6 +51939,18 @@ msgstr "Reporting"
msgid "Every hour" msgid "Every hour"
msgstr "Every hour" msgstr "Every hour"
# TRANSLATION
# LABEL/ID_ONCE_PER_DAY
#: LABEL/ID_ONCE_PER_DAY
msgid "Once per day"
msgstr "Once per day"
# TRANSLATION
# LABEL/ID_TWICE_PER_DAY
#: LABEL/ID_TWICE_PER_DAY
msgid "Twice per day"
msgstr "Twice per day"
# TRANSLATION # TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_USERS # LABEL/ID_TASK_SCHEDULER_REPORT_USERS
#: LABEL/ID_TASK_SCHEDULER_REPORT_USERS #: LABEL/ID_TASK_SCHEDULER_REPORT_USERS

2
workflow/engine/data/mysql/insert.sql
View File

@@ -60266,6 +60266,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_OLD_VERSION','en','old version','2014-01-15') , ( 'LABEL','ID_OLD_VERSION','en','old version','2014-01-15') ,
( 'LABEL','ID_ON','en','On','2014-01-15') , ( 'LABEL','ID_ON','en','On','2014-01-15') ,
( 'LABEL','ID_ON_TIME','en','On Time','2014-01-15') , ( 'LABEL','ID_ON_TIME','en','On Time','2014-01-15') ,
( 'LABEL','ID_ONCE_PER_DAY','en','Once per day','2015-03-10') ,
( 'LABEL','ID_OPEN','en','Open','2014-01-15') , ( 'LABEL','ID_OPEN','en','Open','2014-01-15') ,
( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') , ( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') ,
( 'LABEL','ID_OPEN_CASE','en','Open Case','2014-01-15') , ( 'LABEL','ID_OPEN_CASE','en','Open Case','2014-01-15') ,
@@ -61287,6 +61288,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TUE','en','Tue','2014-01-15') , ( 'LABEL','ID_TUE','en','Tue','2014-01-15') ,
( 'LABEL','ID_TYPE','en','Type','2014-01-15') , ( 'LABEL','ID_TYPE','en','Type','2014-01-15') ,
( 'LABEL','ID_TYPE_PROCESS','en','Process Type','2014-10-22') , ( 'LABEL','ID_TYPE_PROCESS','en','Process Type','2014-10-22') ,
( 'LABEL','ID_TWICE_PER_DAY','en','Twice per day','2014-10-22') ,
( 'LABEL','ID_UID','en','UID','2014-01-15') , ( 'LABEL','ID_UID','en','UID','2014-01-15') ,
( 'LABEL','ID_UNABLE_GET_DASHBOARDS','en','Unable to get Dashboards','2014-01-15') , ( 'LABEL','ID_UNABLE_GET_DASHBOARDS','en','Unable to get Dashboards','2014-01-15') ,
( 'LABEL','ID_UNABLE_START_CASE','en','Unable to start a case','2014-01-15') , ( 'LABEL','ID_UNABLE_START_CASE','en','Unable to start a case','2014-01-15') ,

24
workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
View File

@@ -30,12 +30,12 @@ class TaskSchedulerBM
"category" => "case_actions", "category" => "case_actions",
"file" => "workflow/engine/bin/cron.php", "file" => "workflow/engine/bin/cron.php",
"filew" => "workflow\\engine\bin\cron.php", "filew" => "workflow\\engine\bin\cron.php",
"startingTime" => "0:00", "startingTime" => null,
"endingTime" => "0:30", "endingTime" => null,
"timezone" => "default", "timezone" => "default",
"everyOn" => "1", "everyOn" => "1",
"interval" => "week", "interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6", "expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_CALCULATE_ELAPSED_DESC' "description" => 'ID_TASK_SCHEDULER_CALCULATE_ELAPSED_DESC'
], ],
[ [
@@ -60,12 +60,12 @@ class TaskSchedulerBM
"category" => "case_actions", "category" => "case_actions",
"file" => "workflow/engine/bin/cron.php", "file" => "workflow/engine/bin/cron.php",
"filew" => "workflow\\engine\bin\cron.php", "filew" => "workflow\\engine\bin\cron.php",
"startingTime" => "0:00", "startingTime" => null,
"endingTime" => "0:30", "endingTime" => null,
"timezone" => "default", "timezone" => "default",
"everyOn" => "1", "everyOn" => "1",
"interval" => "week", "interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6", "expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_CLEAN_SELF_DESC' "description" => 'ID_TASK_SCHEDULER_CLEAN_SELF_DESC'
], ],
[ [
@@ -183,12 +183,12 @@ class TaskSchedulerBM
"category" => "processmaker_sync", "category" => "processmaker_sync",
"file" => "workflow/engine/bin/ldapcron.php", "file" => "workflow/engine/bin/ldapcron.php",
"filew" => "workflow\\engine\bin\ldapcron.php", "filew" => "workflow\\engine\bin\ldapcron.php",
"startingTime" => "0:00", "startingTime" => null,
"endingTime" => "0:30", "endingTime" => null,
"timezone" => "default", "timezone" => "default",
"everyOn" => "1", "everyOn" => "1",
"interval" => "week", "interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6", "expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_LDAP" "description" => "ID_TASK_SCHEDULER_LDAP"
], ],
[ [
@@ -198,12 +198,12 @@ class TaskSchedulerBM
"category" => "plugins", "category" => "plugins",
"file" => "workflow/engine/bin/cron.php", "file" => "workflow/engine/bin/cron.php",
"filew" => "workflow\\engine\bin\cron.php", "filew" => "workflow\\engine\bin\cron.php",
"startingTime" => "0:00", "startingTime" => null,
"endingTime" => "0:30", "endingTime" => null,
"timezone" => "default", "timezone" => "default",
"everyOn" => "1", "everyOn" => "1",
"interval" => "week", "interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6", "expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_PM_PLUGINS_DESC" "description" => "ID_TASK_SCHEDULER_PM_PLUGINS_DESC"
] ]
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/