Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

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;
+    	foreach($actions as $action)
-    	print "<tr ".$bc[$var].">\n";
-    	print "<td>".$langs->trans('desc'.$code)."</td>\n";
-    	print '<td align="center">';
-    	if ($conf->use_javascript_ajax)
     	{
-    		print ajax_constantonoff($code);
+    		$var = !$var;
-    	}
+    		print "<tr ".$bc[$var].">\n";
-    	else
+    		print "<td>".img_object('', $key).$langs->trans('desc'.$action)."</td>\n";
-    	{
+    		print '<td align="center">';
-    		if (! empty($conf->global->$code))
+    		if ($conf->use_javascript_ajax)
     		{
-    			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del'.$code.'">';
+    			print ajax_constantonoff($action);
-    			print img_picto($langs->trans("Activated"),'switch_on');
-    			print '</a>';
     		}
     		else
     		{
-    			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set'.$code.'">';
+    			if (! empty($conf->global->$action))
-    			print img_picto($langs->trans("Disabled"),'switch_off');
+    			{
-    			print '</a>';
+    				print '<a href="'.$_SERVER['PHP_SELF'].'?action=del'.$action.'">';
+    				print img_picto($langs->trans("Activated"),'switch_on');
+    				print '</a>';
+    			}
+    			else
+    			{
+    				print '<a href="'.$_SERVER['PHP_SELF'].'?action=set'.$action.'">';
+    				print img_picto($langs->trans("Disabled"),'switch_off');
+    				print '</a>';
+    			}
     		}
+    		print '</td>';
+    		print '</tr>';
     	}
-    	print '</td>';
-    	print '</tr>';
     }
 }
 else