Merge branch 'set-workflow-application' of https://github.com/gplanch…

…at/marello-dev into gplanchat-set-workflow-application Conflicts: src/Marello/Bundle/PurchaseOrderBundle/Resources/config/oro/workflows.yml
brainOut · May 11, 2018 · 80b064b · 80b064b
2 parents 167052f + fe79417
commit 80b064b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/Marello/Bundle/OrderBundle/Resources/config/oro/workflows.yml b/src/Marello/Bundle/OrderBundle/Resources/config/oro/workflows.yml
@@ -7,6 +7,8 @@ workflows:
         defaults:
             active: true
 
+        applications: ['marello']
+
         attributes:
             payment_reference:
                 type: string

diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Resources/config/oro/workflows.yml b/src/Marello/Bundle/PurchaseOrderBundle/Resources/config/oro/workflows.yml
@@ -7,6 +7,8 @@ workflows:
         defaults:
             active: true
 
+        applications: ['marello']
+
         attributes:
             received_items:
                 type: entity
@@ -71,4 +73,4 @@ workflows:
                         entity: $po
                     - @marello_purchase_order_transit_complete_action:
                         entity: $po
-            cancel_purchase_order_definition: ~
+            cancel_purchase_order_definition: ~
diff --git a/src/Marello/Bundle/RefundBundle/Resources/config/oro/workflows.yml b/src/Marello/Bundle/RefundBundle/Resources/config/oro/workflows.yml
@@ -7,6 +7,8 @@ workflows:
         defaults:
             active: true
 
+        applications: ['marello']
+
         steps:
             pending:
                 allowed_transitions:

diff --git a/src/Marello/Bundle/ReturnBundle/Resources/config/oro/workflows.yml b/src/Marello/Bundle/ReturnBundle/Resources/config/oro/workflows.yml
@@ -7,6 +7,8 @@ workflows:
         defaults:
             active: true
 
+        applications: ['marello']
+
         steps:
             pending:
                 allowed_transitions: