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

Make code simpler

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-17 19:24:50 +02:00
parent 73b17dc4c5
commit 7d9a4f2441
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/workflow.php
View File

@ -77,10 +77,10 @@ print "</tr>\n";
clearstatcache(); clearstatcache();
$workflowcodes=array( $workflowcodes=array(
'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled),'child'=>'order','parent'=>'propal'), 'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled), 'picto'=>'order'),
'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled),'child'=>'propal','parent'=>'order'), 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled), 'picto'=>'order'),
'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('enabled'=>($conf->commande->enabled && $conf->facture->enabled),'child'=>'invoice','parent'=>'order'), 'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('enabled'=>($conf->commande->enabled && $conf->facture->enabled), 'picto'=>'bill'),
'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('enabled'=>($conf->facture->enabled && $conf->commande->enabled),'child'=>'order','parent'=>'invoice'), 'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('enabled'=>($conf->facture->enabled && $conf->commande->enabled), 'picto'=>'bill'),
); );
if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) $workflow = array_merge($workflow, $conf->modules_parts['workflow']); if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) $workflow = array_merge($workflow, $conf->modules_parts['workflow']);
@ -89,14 +89,14 @@ $nbqualified=0;
foreach($workflowcodes as $key => $tmparray) foreach($workflowcodes as $key => $tmparray)
{ {
$child=$tmparray['child']; $picto=$tmparray['picto'];
$parent=$tmparray['parent']; $enabled=$tmparray['enabled'];
if (empty($conf->$child->enabled) || empty($conf->$parent->enabled)) continue; if (empty($enabled)) continue;
$nbqualified++; $nbqualified++;
$var = !$var; $var = !$var;
print "<tr ".$bc[$var].">\n"; print "<tr ".$bc[$var].">\n";
print "<td>".img_object('', $tmparray['child']).$langs->trans('desc'.$key)."</td>\n"; print "<td>".img_object('', $picto).$langs->trans('desc'.$key)."</td>\n";
print '<td align="center">'; print '<td align="center">';
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {