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

Workflow is empty by default but can be modified with module workflow

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-01 09:37:54 +00:00
parent f33c9c00e0
commit f5b43e0d08
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/admin/workflow.php
View File

@ -92,10 +92,13 @@ print "</tr>\n";
clearstatcache(); clearstatcache();
$workflowcodes=array('WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>'WORKFLOW_PROPAL_AUTOCREATE_ORDER'); $workflowcodes=array();
if ($conf->propal->enabled && $conf->commande->enabled) $workflowcodes['WORKFLOW_PROPAL_AUTOCREATE_ORDER']='WORKFLOW_PROPAL_AUTOCREATE_ORDER';
foreach($workflowcodes as $code) if (sizeof($workflowcodes) > 0)
{ {
foreach($workflowcodes as $code)
{
$var = !$var; $var = !$var;
print "<tr ".$bc[$var].">\n"; print "<tr ".$bc[$var].">\n";
print "<td>".$langs->trans($code)."</td>\n"; print "<td>".$langs->trans($code)."</td>\n";
@ -118,6 +121,11 @@ foreach($workflowcodes as $code)
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
}
}
else
{
print '<tr><td colspan="3">'.$langs->trans("ThereIsNoWorkflowToModify");
} }
print '</table>'; print '</table>';

2
htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
View File

@ -101,7 +101,7 @@ class InterfaceWorkflowManager
if ($action == 'PROPAL_CLOSE_SIGNED') if ($action == 'PROPAL_CLOSE_SIGNED')
{ {
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);
if (! empty($conf->commande->enabled) && ! empty($conf->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
{ {
include_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); include_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
$order = new Commande($this->db); $order = new Commande($this->db);