diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 412eff9395b..3a660ee7f08 100755 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -106,7 +106,7 @@ foreach($workflow as $child => $parents) { foreach($actions as $action) { - $workflowcodes[$action] = $action; + $workflowcodes[$child][] = $action; } } } @@ -115,33 +115,36 @@ foreach($workflow as $child => $parents) if (count($workflowcodes) > 0) { - foreach($workflowcodes as $code) + foreach($workflowcodes as $key => $actions) { - $var = !$var; - print "\n"; - print "".$langs->trans('desc'.$code)."\n"; - print ''; - if ($conf->use_javascript_ajax) + foreach($actions as $action) { - print ajax_constantonoff($code); - } - else - { - if (! empty($conf->global->$code)) + $var = !$var; + print "\n"; + print "".img_object('', $key).$langs->trans('desc'.$action)."\n"; + print ''; + if ($conf->use_javascript_ajax) { - print ''; - print img_picto($langs->trans("Activated"),'switch_on'); - print ''; + print ajax_constantonoff($action); } else { - print ''; - print img_picto($langs->trans("Disabled"),'switch_off'); - print ''; + if (! empty($conf->global->$action)) + { + print ''; + print img_picto($langs->trans("Activated"),'switch_on'); + print ''; + } + else + { + print ''; + print img_picto($langs->trans("Disabled"),'switch_off'); + print ''; + } } + print ''; + print ''; } - print ''; - print ''; } } else diff --git a/htdocs/theme/amarok/img/object_invoice.png b/htdocs/theme/amarok/img/object_invoice.png new file mode 100644 index 00000000000..a9095ae91da Binary files /dev/null and b/htdocs/theme/amarok/img/object_invoice.png differ diff --git a/htdocs/theme/auguria/img/object_invoice.png b/htdocs/theme/auguria/img/object_invoice.png new file mode 100755 index 00000000000..b4022e77740 Binary files /dev/null and b/htdocs/theme/auguria/img/object_invoice.png differ diff --git a/htdocs/theme/bureau2crea/img/object_invoice.png b/htdocs/theme/bureau2crea/img/object_invoice.png new file mode 100644 index 00000000000..e1cb50de2e6 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/object_invoice.png differ diff --git a/htdocs/theme/cameleo/img/object_invoice.png b/htdocs/theme/cameleo/img/object_invoice.png new file mode 100644 index 00000000000..e1cb50de2e6 Binary files /dev/null and b/htdocs/theme/cameleo/img/object_invoice.png differ diff --git a/htdocs/theme/eldy/img/object_invoice.png b/htdocs/theme/eldy/img/object_invoice.png new file mode 100644 index 00000000000..b4022e77740 Binary files /dev/null and b/htdocs/theme/eldy/img/object_invoice.png differ