lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX order or proposals billed if both workflow conf activated

Browse Source
This commit is contained in:
atm-arnaud 2019-08-01 11:00:49 +02:00
parent 9a87e27176
commit f64092a1e8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
View File

@ -121,7 +121,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
if ($action == 'BILL_VALIDATE') if ($action == 'BILL_VALIDATE')
{ {
dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id ); dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
$ret = null;
// First classify billed the order to allow the proposal classify process // 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)) if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
{ {
@ -142,7 +143,6 @@ class InterfaceWorkflowManager extends DolibarrTriggers
} }
} }
} }
return $ret;
} }
// Second classify billed the proposal. // Second classify billed the proposal.
@ -165,8 +165,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
} }
} }
} }
return $ret;
} }
return $ret;
} }
// classify billed order & billed propososal // classify billed order & billed propososal