Merge with develop: solving conflicts

2019-05-29 13:12:45 -04:00
parent f53a3e3e0f d93c713297
commit 5dd5a25a74
93 changed files with 6342 additions and 6993 deletions
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -991,7 +991,7 @@ class WsBase
                $subject,
                G::buildFrom($setup, $from),
                $to,
-                G::replaceDataGridField(file_get_contents($fileTemplate), $fieldsCase, false),
+                G::replaceDataGridField(file_get_contents($fileTemplate), $fieldsCase, false, true),
                $cc,
                $bcc,
                '',