Merge pull request #11608 from atm-arnaud/8.0_FIX_workflow_propal_and…

…_order_billed FIX order or proposals billed if both workflow conf activated
Dolibarr · Aug 1, 2019 · e4f2728 · e4f2728
2 parents 9a87e27 + cd0d5c4
commit e4f2728
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -121,7 +121,8 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
         if ($action == 'BILL_VALIDATE')
         {
         	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
-
+        	$ret = 0;
+
 			// First classify billed the order to allow the proposal classify process
 			if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
         	{
@@ -142,7 +143,6 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
         		        }
         		    }
         		}
-        		return $ret;
         	}
 
 			// Second classify billed the proposal.
@@ -165,8 +165,9 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
         		        }
         		    }
         		}
-        		return $ret;
         	}
+
+        	return $ret;
         }
 
         // classify billed order & billed propososal